Moved more code to es5-shim