[DF-4116] - Code Review, Win32 changes.