Minor refactorings...