continuing cleanup and abstraction of the map interface, and related classes/logics.