Another portion of refactoring.