Refactoring for fun and profit.

Defining done in software is a moving target.