Added in more simplification steps.