More line-wrapping tweaks

Including, but not limited to, more semantic linebreaks. Makes diffs such as these
( https://github.com/porras/ghcontributors/commit/a996ab2a589f7740772418945a705eb46b3b3633 )
look better, and allows easier reading and editing of the source code.