Match the spec properly

Fixes #1 and #2.
That’s also what I said here, FWIW: https://github.com/paulmillr/es6-shim/pull/310#discussion_r21781605