Refactored macros.