Break some long lines, no functional change
11 files changed