Thanks for the heads-up. I installed the attached patch, which should fix it by 
reverting my previous change. As the commit message suggests, underlying bugs 
probably lurk here. Now is not a good time to disturb them, though.