Fixup for PR #2828 to respect line length limits.