Clean up some more coverity issues.