Move consts to macros for clarity