Minor refactoring progress.