It was easier to test than I thought. Works fine here without `set -g`. I think this is good to merge now. Thanks!