[cvs-nhc98] patch applied (hat): Use cpp-hackery to massage the differences in the API of Data.Set between