move towards a simpler AST