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