Map, MultiMap: Fix type errors