ZSH refurb.  Thanks @jfred.