Silence some scan-build warnings.
Merge pull request #544 from rohitnirmal/saber

Silence some scan-build warnings.