Fixes for es6ification

Minor fixes for the recently merged and awesome ES6-ification.