More ES6ing.