[eval2] Clean up some more.