[Git][ghc/ghc][master] Refactor fundeps again