Fix verifier bug caused by coercing types to Class and then using the result for astypelate which expects Class types. Instances of Class however were not treated as Class types in astypelate.
This may just be a workaround until a better soltion is found.
Merge.