More progress on Windows support.