Hello,

I think we can fix this (both cases mentioned) similarly as in cl-letf: