Untested changes to make the '-s windows' option

work on Windows.