Merged the earlier fix into the preprocessor programming for Visual Studio.