Move another rewriter to the new AST