Ensure the correct typechecking component is used in tracing context, fixes tests