Another oops.
Show off a bit more of the Matchers package
Sync with current schemagen output: adds "config". Did not rm nillables.
Modernize