Simplify ExpressionFactory: expectedType now default
createValueExpressionByInstance was renamed to createVariable