WIP – properly put comments on several lines

Oh, \r, how I loathe thee... and Eclipse, why did you render
solitary CRs without LFs as line breaks?!
WIP – fix more newline goodness

Praise the lord, the tests are green! That means that we can soon ship
this feature to a master branch near you.