Merge minor changes from coreutils.