Resolve the two different approaches to the internal data structures.
Resolve the two different approaches to the internal data structures.