A little more progress refactoring.