scope_guard: fix silly mistake in ON_SCOPE_EXIT.

The previous implementation worked when used once per function, which
happened to be enough to pass the tests.  Macro token pasting is now
fixed.