Match the spec properly

Fixes #1 and #2.
yeah, you're right - I'm thinking of the `es6-shim`. Never mind on this one.