MS-Windows followup to last commit.