Clang fix.
Merge pull request #4097 from ktf/final-clang-fix

Clang fix.