factored Containers/Private/DataStructures stuff into there plus Containers/Private/PatchingDataStructures