Make sure as much of ES6 as possible works in ES3

Fixes #37