RFCT Remove C-style MACRO_CONSTANTS