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

Final clang fix.