match implementation of GHC proposal #106 (Define Kinds Without Promotion)
After (ghc!8962 (closed)), HsDataDefn will have an additional field dd_type marking type data declarations, so the two merges need to happen together.
Edited by Ross Paterson