Simplify conditions before inserting them