Re: Win32s cleanups