Even deeper in the haze of refactoring.