Some private->internal refactoring.