Fix up set handling with new type structure