Thus introducing a few functional regressions, but it's going to be easier to fix things up without the old code knocking around and getting in the way.
