Add some more cleanup code for Win32.