Don't copy the map in map_find (doh)

And provide and use a const version.
Remove an extra leftover call to find().