Cleaning up polyfill stuff, more options/consistency.