zsh: Update Lookup functions from upstream