don't use cl-flet

The forward-compatibility cl-lib does not define it.  Instead use let
and funcall (2x) and merge simple flet-ed functions directly into the
code that uses it (1x).