Various improvements to delay_baseline_threaded.cpp