Squashed some code analysis issues.