Now they match better what the vanilla /trace data does in terms of
object and field names.