Minor refactorizations.