Fix overly long lines

To make them easier to review.