Test suite passes again after all that refactoring.