Replace 'Type' and 'Value type' constraints by 'Item' and 'Target
required claim' constraints.
Cherry-picking commit e2854db.