Fix trace builder to not confuse self-verification.
6 files changed