Cosmetic fixes for Windows.

[originally from svn r4212]