(uniquify-after-kill-buffer-p): Fix misleading docstring. (uniquify-make-item): Make `proposed' optional. (uniquify-rationalize-file-buffer-names): Don't compute the initial proposed name. (uniquify-buffer-file-name): Remove dead code. (uniquify-strip-common-suffix): New var. (uniquify-rationalize): Always recompute initial proposed name. Strip common suffix if requested.