Minor refactoring.
More minor refactoring.