Corrected a dependency on newer C++ macros that were not acceptable to MS.