Improvements to evaluation code.