Shuffle some comments into the right place