Implement separate analyzer for evaluator, end of section 4.1.x