[eval2-debug] Fix more refactoring errors.
[eval2-debug] Fix debug-var information.