Slight organizational refactoring.