zshrc: Unification cleanup - Episode II