Fix W32-specific part of last change.