It might be good to move the polyfill out... then it makes it easier for us to manage spec issues and polyfill issues.