Make pypy work with single threaded tcl and also some fixes from sthen.