More cleanup based on static analysis
https://github.com/fish-shell/fish-shell/issues/575