ccl_qual_dup fixes; previous version totally broken