[PATCH 6.6 027/222] cleanup: Adjust scoped_guard() macros to avoid potential warning