More trace changes.