Hi Arash, many thanks for taking a look.  Regarding cl-find-if, I have
no strong feelings, but have attached the modified patch without it in
case that simplifies matters.  Thanks, best,   Paul