Norihiro Tanaka wrote:
> Sorry, I have discovered a bug in your improvement, and fix it.

Thanks for reporting and fixing that!  I installed that.  Also, I tried 
to change the code a bit to make similar bugs less likely in the future, 
and installed the attached followup patch.