Harmony -> ES6, split out ES7 stuff