Cosmetic updates for the Windows code.