Cleaned up trace_wrap()

As seen in person