> To make it more concrete, here's a suggested patch.

Hmm... got a bit carried away on the simplification of
cl-generic, sorry.
Here's a better patch that does work.


        Stefan