More AST simplification