Update collectXxx actions to return a Collection rather than a mixed Stream + Collection