Win32: Improve last commit.