AST rewritting improvements