more es6 module fixes:

* don’t diverge bindings
* don’t clobber imports

WIP: more to come.