Follow up of !56243 (closed), where something went wrong. cppcheck resolutions, plus formatting changes.