[Git][ghc/ghc][master] Take subordinate 'type' specifiers into account