Changed logic of ExpressionCodegen.returnExpression