Minor cleanup. Rebuild es6-shim