Fix issue reported by the byte-compiler

[tarsius]

Please see the commit messages for more information.

[PythonNut]

The switch to cl-labels appears correct. The reason I avoid requiring flx is due to lazy-loading. The warnings can be suppressed with declare-function instead, right?

[tarsius]

The reason I avoid requiring flx is due to lazy-loading.

I figured that much, but was left wondering why. flx.el itself should be loaded in a blink and while its only dependency, cl-lib, certainly takes a while, it is almost certain that some other package that is loaded during startup loads that anyway. To me this seems like an unnecessary and ineffective optimization, but I didn't benchmark it.

The warnings can be suppressed with declare-function instead, right?

Right. If you really want to go down that road, then I can do that.

[tarsius]

I've deleted my fork. I think in the past that did not cause pull-requests to be closed. I hope you can still reopen and merge this.