Simplify & fix vendorized six import in pexpect