More macro cleanup.