Improve `import` a bit.