Fix issue with type variables in super class dictionary types. Simplify desugaring somewhat, add more examples