ES6 cleanup.
Merge pull request #5628 from rwjblue/es6-cleanup

ES6 Cleanup - Part 100...