Remove where's nil-tolerance in favour of the wherever idiom.