Converted r->subsumees to Set and r->subsumer_list to List.