Use less linebreaks, closes #627