Simplified to use only one mapper again.
Reduced the occupancy of the vertex map.

Fewer collisions.
Merge branch 'alternate-mapper'