Match the spec properly

Fixes #1 and #2.
No it’s not: https://github.com/paulmillr/es6-shim/pull/310#discussion_r21781691