Indeed, but I saw that as an optimization. If I remove the public API on PreferencesManager for adding a Scope (which no one should be using yet), then we can use pre-constructed contexts trivially. But, with that addScope capability there, it becomes a little bit more complicated because those pre-constructed contexts would need to be adjusted.

That may not be a big deal, though. I'll think about that.