Apply changes from clang-format

[aardappel]

Thanks! Not all of these are better than what they replace.. but they have the advantage that we don't need to reconsider them in future clang-formats, so it's ok to merge.