Refactor some more stuff.
Allow to use qualified relative imports.
Remove some unused code from `import`.