More macro clean up.