Static code analyser cleanup

More will follow.