Yes, we should be consistently using `map`