[Git][ghc/ghc][wip/T25974] 60 commits: Track rewriter sets more accurately in constraint solving