Refactor sygus eval unfold (#1946)