bits and pieces of code tidying

[wspr]

(the diff messes up some of the changes, anything that looks weird is just a change of indenting)

[u-fischer]

Oh wow. That's what you were doing. There are two or three places where I'm a bit unsure. I will have to compare the files side by side with mine.