On Mon, 26 Jan 2015 10:14:56 -0500, Stefan Monnier wrote:
[...]
> This looks correct.  Ideally this part of cl--function-convert should
> delegate to cl--labels-convert to avoid the code duplication, tho.

That's much better.  Here it is: