Re-flow several long lines from #1578269.
6 files changed