Fix trace-data for defns