Minor string-length refactoring.