Reworking infinimap. Again.