Add Karrick's mods for retaining the current directory for *shell-command