Shuffle some code around, no functional change