Cruft removal.
Fix and add tests for map().