Hi Samuel,

Samuel Wales <samologist@gmail.com> writes:

> Would this also get rid of the current-file special case?  If so, this
> sounds good to me and I will test it.

Please test the attached patch against maint and let me know what
issues it fixes for you.

Thanks,