I seem to like preprocessor macros.
We don't need parentheses around C strings made via the preprocessor to get NSStrings.
Minor string change.
Merge branch 'master' into colorFlags