Some changes to `import` for #659