[eval2] Fix a refactoring bug.