Now zsh should behave the same for those two subcommands as bash. (cherry picked from commit 81333ecf)