* fold-const.c (fold_comparison): Clean up and extend X +- C1 CMP C2