More macro rewrite