Two signficant changes to the simplifier