hash tables, instead of the previous kluge involving multiple hash tables.
This partially undoes my patch of last December.