Improvements to simplification.