More tweaks to the static code analysers.