zshrc: Clean up vcs_info() a little