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