OK, thanks, I installed the attached patch into gnulib and am marking the bug as 
fixed.