Update (and test) AST grammar based on feedback