Even more cleanup from code analysis.