Also be more consistent on preprocessor #define entries between Visual Studio builds and command line nmake Makefile builds.