Last round of clang fixes.
Merge pull request #3914 from ktf/clang-fixes

CLANG -- More clang fixes.