= core: Inline variant of withTraceContext using macros.
Merge remote-tracking branch 'crypticmind/master'