Mostly to make clang-tidy happier (cherry picked from commit 34d403e83f42304332f89ffc73549f6f2c695ccd)