Started making threads context-reentrant.  Still a crash to solve.