A few cleanups to threaded product code and test.
2 files changed