Port space handling fixes in EL.
Imports now require a package.