Whoops, this should be a terminal.
Add a quick sketch of schema parsing.
Rename some bad names.
Simplify/correct the grammar.