Fixing up more of Python 3 local imports