This looks less weird to have them flow as they fit than breaking on every single line. Fixes #2213
+