More cleanups of Containers/Private/DataStructures/Array