Small code refactorings.