Split up long lines for style and readability.
Merge pull request #2905 from braddunbar/line-length

Split up long lines for style and readability.
Tweaking #2905 -- long line styles.