Add key-based iteration to the maps.
Regenerate map types.
Add a unit test for key-based iteration of maps.