Cleanup coding style

This is just an automated run of
clang-format version 3.6.0 (trunk 224979) across all modules.

(clang-format 3.6 is slightly less dumb than the previous version used.)