[cvs-nhc98] patch applied (hat): #defines to fix Data.Set interface mismatches