General code style clean-up towards single, established style.

Starting point was
indent -bad -bap -bbb -bbo -bl -blf -bls -bli0
       -cli2 -i2 -ip0 -lp -l79 -lc19 -cd0 -nfca
       -nut -sbi2 -sai -saf

with some hand-tuning.