Added intermediate-step implementation for Expression and FunctionCall