[GHC] #11709: Merge some TypeInType fixes