[Git][ghc/ghc][wip/amg/castz] Attempt to improve T5030 by zapping in ds_hs_wrapper