[MERGE] Cleanup astyle whitespace crap

This patch cleans up a lot of the whitespace crap which was added by
astyle.

- spurious blank lines before ;
- named struct{} members had their name on a new line
- bitfields quite messed up

and some minor manual things to avoid compact & empty if constructs not
easily followed.