Another pass trying to get the Windows build right.