Some restructuring of labels and jumps in the codegen