More massive refactoring.
More humungous refactoring.