Additional changes related to https://github.com/fish-shell/fish-shell/pull/592