Apply the important tidbits from thread-safety. Closes #68 and #69.