Move the kind annotation to TraceF