updates to GrammarAST