Upgrade to latest analyzers package and fix the warnings

[stevenaw]

We've recently released v3.9.0 of the analyzers. The framework repo still targets 3.6.1
I tested an upgrade recently and found a few things getting flagged which should be fixed