Run the astyle script.

I guess we'd need to teach astyle to keep oneliners oneliners.
But apart from that, there were some tab/space issues.
Merge pull request #1102 from stefanbeller/master

Run the astyle script.