added extra whacks on the WindowsEnvironmentVariableParsing