Backed off a bit of the merge for exit_on_zero to exit_on_complete.