Add local stash directory
Tweak comment: 'until' implied it happened only once