Match the spec properly

Fixes #1 and #2.
Per https://twitter.com/awbjs/status/543582028986200064, this *should* be configurable - everything post-ES5 is default configurable unless explicitly specified otherwise.