Have a single data structure instead of two.

This wide-ranging change is the first of several in simplifying
from two item-tracking data structures down to one.

The current code isn't as clean as it should be, where it just passes
tests again.  Future changes will address readability and even more
simplification.