Clean up build warnings spotted by travis-ci.