Merge dired-x's redefinition of dired-initial-position into the main version.