Add/Improve ES6 handling.