Iterable maps (iterates entries). Minor clean up.
Merge branch 'origin/master'