Re #7417. Address cppcheck warnings.

…while I'm touching the file anyway.
Merge branch 'feature/7417_rename_broken' into develop