Refactor|Partitioner: Further cleanup of Partitioner

This will do for now. I'll return to this once the implementation of
the map data elements has progressed further.