Refinements to the Haddock 2 integration