[Git][ghc/ghc][wip/T23162-part2] 41 commits: Preserve user-written kinds in data declarations