Updated IsDistinct to apply plural form to column refs in the where clause