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