Rewrite inserted and removed clauses to match old semantics