Thanks, I installed the attached somewhat-fancier patches which should 
do the same thing; please see what you think. Boldly closing bug#74927.