Smaller clang diagnostic scope.
Merge pull request #1847 from tewha/smaller-diagnostic-scope

Smaller clang diagnostic scope.