Use IndexSet::Index for indices instead of hardwiring 'int', Part II

The main patch for this was 092259b8873a980f6b2c2bbb5a0040cc4ea61849

There I forgot a few 'int' in the 'contains' methods.  The present patch
fixes that.