Simon's fixes to the generated type instances in Generics