Bug 814257 - Worker thread friendly; not ready for review

Putting this up to make it easier to find this work.