Slightly simplifying usage of map related functions.
doc fix