Moved scooping into a separate helper.
Merge pull request #5355 from comma/holder

Moved scooping into a separate helper.