Tweak Base->map (Feature request #595)