[WIN32CSR] Clean up the debris from r47314: Removed some redundant code, reorganized...