Simplify the AST and make the parser a lot prettier.