Corrected #define constant syntax, embracing them