> I was trying to make the patch as small as possible, but I ought to have
> done it as you say.  Letting everything flow through to the end so that
> there is only one return point is definitely the cleanest way to do it. 

Here, yes, it appears to be the case.  Any way, does the attached appear 
to work?

Andrew