Restructuring evaluation code.