Replace deprecated flet with cl-flet
Ensure cl-macs are available before use