Re #7424. Remove now unused variable.
Re #7424. Remove no-longer needed warning suppression.
Re #7424. Address cppcheck warnings.

…while I'm touching the file anyway.