Big bang refactoring: Kill all macros