Just moving some code to a slightly different spot.