Removed the need for a special vector-type map.