More macro rewriting