Ported more grammar.
Regen'd parser.