Simplify grammar
Change AstNode.tree -> AstNode.ast