Merge from gnulib (comment fixes only).