Cleaning the multiple merges.
Having the dynamic grammars play nice with the static ones.
Testing the new parser.