Minor cleanup of the windows build.