Fix WITH-GENSYMS and CDR5