More macro wrangling