Parser and AST cleanup/normalization