Various code analysis changes