[Git][ghc/ghc][wip/9.10.3-backports] Take subordinate 'type' specifiers into account