I'm going to push these shortly.  There will be at least one more to
sync with the latest gnulib.