Some const and interface cleanup in map.