More merge fixes: prepare_scorer() must follow init_loading() in daemon_main.