Re: [GHC] #9388: Narrow the scope of the notorious "state hack"