contrib: pick: bugfix: make the right variable buffer-local