Clean up output messages and add calc_paths_eff.