Well, I was apparently not up-to-date on the latest Haddock config magic.
Removed the last change, which forced the use of an external installation
of Haddock.