Some more clang-tidy fixes

Tobias Leibnerrequested to merge
more_tidy_fixes into master

Some left-over fixes from yesterdays fix_clang_tidy run.

Merge request reports