- applied astyle to add missing {} brackets in if/then/else blocks
- reapplied clang-format 5.0, which now indents properly blocks.

Statements in an if/then/else, even very short,
deserve their own line, for GCOV.