WYCS: bug fix for constants and the new set type.