Improved Windows build script (again).