More very small refactorings.