This removes some left over Python 2 compatibility code. It also makes
sure that public modules do not "unpack" any modules. That is 'from foo
import fee` is pretty much not used in public modules.