More clang fixes.
Merge pull request #3570 from ktf/dataformats-math-ok

Clang -- More clang fixes.