[Git][ghc/ghc][wip/andreask/cbv_array] 326 commits: Preserve user-written kinds in data declarations