Fix up cppcheck suppressions after reflow.
2 files changed