Move most of simplify clauses into solver.