Update Windows port, somewhat.