Trivial refactorings.