And correctly detect unexpected fields.

fixes #1331

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>