Fix syntax errors reported by Clang.
Merge pull request #1 from google/clang-fixes

Fix syntax errors reported by Clang.