Clean up fixes from issue #3

Make checks on ignored keys strict on type as well as value to remove
some of the workaround code put in place.  Removed workaround code
entirely