OvO tie breaking simplified

GitHub is acting a bit strange, I hope you only see one commit in this PR (I see yours listed as well).