Remaining 'return in _each' fixes