More WinProc cleanup.