Further small improvements to map_field timing. Mapping still only takes <5% of total time of map_field routine.