I have to admit I don't really understand the point of this PR, it feels like a ton of churn for little gain.   Now we have this split between the default and os, and fallbacks via pick(), but I still don't really understand what we gain.  Maybe I'm just not getting it, but so far this feels like a bunch of change that doesn't gain us anything in features and makes this module different to all the other modules.