Clean up some warnings spotted by travis-ci's clang build.