util: Fix trace_scope macros to always return and consume the scope object

Provide a consistent use of the scope in the different definitions of the macros.

This is a first step in making sure that we are always feeding back to trace_end the result of trace_begin.