> Nothing has to be changed; it’s just that I’d prefer to put the bits
> that introduce ‘link-to-empty-environment’ in a separate patch, for
> clarity.

> I could do it, but it may be easier for you to do it, no?

Ah, I simply misunderstood.  I’ll do it.