[Util] Use dedicated scope guard for MakeScopeGuard().