Express likely branches more robustly.

The previous solution only worked for trunk llvm.