Fix clang-tidy findings on files usually excluded.

Fix clang-tidy findings on files usually excluded. #4621