Re-arrange comment blocks.