Change builders of 'Type' and 'Value type' constraints. These builders
create 'Item' and 'Target required claim' constraints instead.