Get rid of some unnecessary allocations in ==>>
Merge pull request #712 from ceedubs/map-allocations

Get rid of some unnecessary allocations in ==>>