astyle was only run on .cpp files this time - already in
ff6b6691 where the style cleanup was done initially, not all
.h files seem to have gotten the same styling (rerunning astyle
on .h files at that commit produces a huge diff).