Some small zsh/bash code improvements

For your consideration.