Fix line breaks that used "," (and avoid suffering TOC from indentation)

I would like to avoid releasing a new version just for this, but I did not have time to fully implement all my desired changes yet. It will come as a different version.