Some `eval` refactoring.