A little internal refactoring.