Add with-thread-safety (maintainer-zts)
Closes #461