Only scrub the parts of the codebase covered by this issue.  Don't worry about the other parts of the codebase yet; we'll do that in a separate issue dedicated to the Windows port.