More refactoring.
More refactoring.