clang-tidy cleanups 2 (#1048)