Re #7417. Address cppcheck warnings.

…while I'm touching the file anyway.