Finish adding support for 2 DLLs in the ghc package; fixes #5987