Update some AST rewrite rules