Silence some scan-build warnings.
Merge remote-tracking branch 'rohitnirmal/scan-build-fixes'