More import/export cleanup.