[4.2] Collection - DDRYs up the code a little more
Merge pull request #5706 from KennedyTedesco/collection-4.2

[4.2] Collection - DRYs up the code a little more