This contains a set of small, mostly cosmetic, changes.
In a few places I have put FIXMEs, so this should not be directly merged, but rather adjusted before, depending on what the answer to the FIXME is.