Macros refactored.