FieldSet : include field type when checking equality

We did this in the FieldList and it got lost in the change to FieldSet.