I liked the newline more, now the line's too long.

It makes sense to join the above two conditions together, because they're short and very much related; it however doesn't make much sense to join these two.