Replace time_watcher observation with the RAII idiom.
Remove unused thread_type