Macro refactor.