Switch various .. commands to actual subcommands

Open to ideas on how to do collapse this that works in both zsh and bash.  I could get it working in one but not the other with with a couple of different iterations of OR statements.