Some indent and style fixes found while going through some old branches

Nothing exciting, see commit messages for details.

Signed-off-by: Guido Günther agx@sigxcpu.org