Make experimental_verify=1 handle all cases properly