Fix #630 more neatly, using gnulib's c-strtod