Even more code analysis cleanup and suppressions.