Minor changes to get module building under Win32 for easier portability (doesn't do anything under Win32, however).