Revert "Fix clang warnings."

This reverts commit a851cc739b5d277cbda9a199e37ed5e2ab48ed65.
Fix clang warnings.