Prefer `map` to the pattern match, again