Started cleaning up PatchingErase() usage of STLContainerWrapper<>...