Cut down on the uses of EvaluateExpression a bit