(ediff-files,ediff-merge-files): better file-name defaults.