Fix overly generous newlines keeping us < 80 chars

We can tolerate +80 chars in basically templated code.