Improve GHC ⇔ Haddock packaging