This should fix the remaining clang-tidy issues here: https://open.cdash.org/viewBuildError.php?type=1&buildid=4601272