Refactor turnaround from orig to term.