A smidgen more refactoring.