Code

Various cleanups in the syncing with gnulib