[Git][ghc/ghc][wip/T23559] 35 commits: Preserve user-written kinds in data declarations