Bug 836470 - Clean up JS module imports that use a temporary scope object. r=gavin