Minor corrections and cleanups; added a missing eval ctxt.