Some `six` import fixes and patch `touch_import` on a per process module call