Get rid of deprecated `evaluating`