(their matchers): Use const_int_operand as predicate, and `n' as constraint. Fix the extra conditions. From-SVN: r4389