Add non-threaded variants.