[Flatzinc] rewrite int_plus, int_times, encode_clause + undo p_bool_eq_reif