py3: Various import cleanups