Minor refactorings for line length logic.