Fix Return/ExpressionList relationship