Address some code-analysis issues.