Fix two bugs: one where a condition was mistakenly swapped, and another

where we folded (X & 254) -> X < 1 instead of X < 2.  These problems were
latent problems exposed by the latest patch.

llvm-svn: 16528