Make TraceCheck Parser independent of clause ordering in TraceCheck file