Another internal refactoring.