Merge "Cleaning up check_best_zero_mv()."