visitor: move away from cd_list_t