Update to @avp's latest base.zsh and make some small changes.