Some ES6 upgrades.