Merge recent gnulib changes, and remove some lint.