TMP: more simplification of forward jumps