Cleaned up compiler flags macros. No functional changes.
Cleaned up compiler flags macros; no functional changes.