Tweaking for compatibility with old ZSH 4.3.11