Even more refactoring.