[eval2-debug] Adapt to recent upstream changes.