ENH: Initial attempt at 'simplify' method.

More tests are needed. Some minor clean up done elsewhere.