SI-7482 Don't cook raw types after erasure.
Merge pull request #2545 from paulp/issue/7482a

SI-7482 Don't cook raw types after erasure.