Change compile-time flag handling (again)

They are `#define`s for now (where a second macro is defined that represents the boolean version)