Simplify and document deepMap utility
Fix and re-enable last of the old tests
Document magic