replace more macros with const counterparts