EENG-5145: Minor tweaks to threaded-ipc branch to prep for tests/review.