Attempt to fix cyclic imports
Merge branch 'master' into imports
Improve extern symbols declaration
Rename more.py -> extend.py