It's fine to have slightly more verbose call sites for the 5-10% of options that are environment specific if it means everything is clearer and we avoid a bunch of semantic issues from subsystems no longer being singletons.

slightly more verbose call sites

This only impacts plugin authors, not end users