New import and export syntax and semantics
Minor tweaks to new import code.