These changes are needed to accommodate GHC proposal 103
(https://github.com/ghc-proposals/ghc-proposals/blob/master/proposals/0103-no-kind-vars.rst),
which has been implemented in HEAD.