Missed two instances of `map` + `collect`.