I don't think we need to change the body of the polyfill factory function, since Intl is just a local variable here. that will reduce the amount of changes in this PR drastically.