Mappers again working how they used to work.

Also made them a bit more efficient. Removed special treatment for root
index vertex.