Reviews appreciated.

I will most likely continue applying these changes in smaller chunks
because a) this kind of work is boring and b) in the hope that smaller
chunks will get reviewed better.