Merge "Avoid generating jmp +0."