Fix map return types.