Give current_context a consistent return value

[zachdaniel]

current_context should return a consistent value in all cases, that can be passed to continue_trace. With that value, continue_trace should be able to determine if its should start a trace at all and if so, if that trace should be a continuation of previous context or a new trace.