Fix ambiguous references to `map`