[Git][ghc/ghc][master] Fix a few tag inference bugs.