Windows: AFSCleanup re-organization