Some tiny refactorings.