Replace macros with constants