Merge "Clean up Win32 platform code" into nyc-dev