Refined stalemate adjudication in Suicide, some cleanup