Improve default schema to be less vulnerable to incorrectly analyzing ignored catch-all field