Refactor the macro.