Slightly more refactoring.