Improve default schema to be less vulnerable to incorrectly analyzing ig...

...nored catch-all field