Reduce the scope of cl-letf to as little as possible