Make each non-threaded and move threaded each to each_threaded