- Minor refactorings.