Remove generics from CompositeType