Make Clang happy.
Merge pull request #7905 from Rivet-the-Zombie/make-clang-happy

Make Clang happy.