[instcombine] Avoid binops for comparison consistency tests

It turns out that instcombine is smarter than I am, and several of these ended up folded for the wrong reasons.