Reformat to keep line length manageable

We haven't finalized what our line length is going be yet, but it's
going to be less than whatever we were using here.