[Git][ghc/ghc][wip/T24464] Simplify the treatment of static forms