(menu-bar-update-buffers-1): Don't display a directory separator if there's no directory. Don't display directories at all if uniquify is active. Some code cleanup. (uniquify-buffer-name-style): Declare (but don't initialize).