Hard wrap lines, and perform some smaller changes. Done in a
separate commit to make rebasing / merging easier.