Fix cppcheck suppressions

cppcheck become more pedantic of its suppression syntax so fix that.
8 jobs for drop-internal
in 5 minutes and 51 seconds and was queued for 7 seconds