Small refactorings.