[GHC] #8488: Annotations should not distinguish type and value