Sorry about leaving this in an inconsistent state. My local tree has yet another revision of the build system, this time relying on Cabal to do all this, after a bootstrap step.