More line-wrapping tweaks

Including, but not limited to, more semantic linebreaks. Makes diffs such as a996ab2 look better, and allows easier reading and editing of the source code.