Fixing warning.
Simplifying macros to fix VS' broken preprocessor.