add structure unique/intersection fixes from 1.6 branch