Minor refactoring changes.