[eval2] Minor cleanups.