Replaced expression evaluator

Replaced expression evaluator with something non-recursive.