A little more refactoring.