Some way of automatically doing the right thing could be nice, yes.
A hypothetical --no-shared-persistence flag could enable
persistent-subtext + set it to the flavour name...