Clean up Windows-specific code in previous commits in the pull request.