Merge pull request #2616 from hzeller/feature-20260918-tidy2

fix remaining clang-tidy parts.