This reverts commit d545ef3f. Please don't commit substantial changes to the generic Haskell builder without giving me a chance to review them.