Improve Simplifier and SpecConstr behaviour