Improvements for simplify()