More cleanups for Win32 sockets. Closes #659