Code cleanup: some time ago, the whole source in "trunk" was reformatted automatically to wrap at a certain width. Unfortunately this made some code pretty ugly by making a bunch of short comment lines with the leftover stuff. So, correct some of that.