258-T2: Small refactorings.