Simplify expression evaluation.

I still need to move the transformation to a tree up the stack.