Fixup simplification changes.
Merge pull request #11 from rwjblue/fix-stupidity

Fixup simplification changes.