Fix for recent changes in map.
We can't specialize map anymore since the version in Base became
more general.