Change type of Dict.map to be more consistent