Clean-up of more Coverity issues.