Minor tracing updates, addresses TransactionState leak

Change-Id: I75cb9f2486404b3e6cbce39247bbdf2b668d4562