Remove macros for readability.