re #8437 lots of style issues, but not quite all
re #8437 catching a couple of warninga
re #8437 and another warning
Merge remote-tracking branch 'origin/feature/8437_cppcheck_style'