Update for finalized ES6 module syntax.