Add map non-member functions. Fix out-of-date comments.
Add non-member functions