Use new cl-flet isntead of flet, this also fixes elint errors.