ghc-doc is affected. BTW: a merge of -main and -doc will be done later, and some other changes are in my queue.