Reorder control code handlers