[Git][ghc/ghc][wip/T24145] 123 commits: Make TYPE and CONSTRAINT apart again