[GHC] #11595: Merge some TypeInType fixes