compiletest: more win32 fallout from 2db3abd
rustc: more fallout from 2db3abd