[eval2] Fix a bug introduced by the latest renamings.