More code analysis cleanup and suppressions.