refactored DataStructures/STLContainerWrapper into patching and non-patching parts