don't use cl-flet

The forward-compatibility cl-lib does not define it.  Instead use let
and funcall (2x) or refactor so that tempory overriding function
definitions are not needed (1x).