Reworking dict interface; renaming to map.