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