Tiny refactorings.