Resolve some trivial ES6 TODOs