1 files changed, 4 insertions, 13 deletions

diff --git a/struct.c b/struct.c
index b36dd37e4b..dc4f99396e 100644
--- a/struct.c
+++ b/struct.c
@@ -686,19 +686,10 @@ rb_struct_each_pair(VALUE s)
 
     RETURN_SIZED_ENUMERATOR(s, 0, 0, struct_enum_size);
     members = rb_struct_members(s);
-    if (rb_block_arity() > 1) {
-	for (i=0; i<RSTRUCT_LEN(s); i++) {
-	    VALUE key = rb_ary_entry(members, i);
-	    VALUE value = RSTRUCT_GET(s, i);
-	    rb_yield_values(2, key, value);
-	}
-    }
-    else {
-	for (i=0; i<RSTRUCT_LEN(s); i++) {
-	    VALUE key = rb_ary_entry(members, i);
-	    VALUE value = RSTRUCT_GET(s, i);
-	    rb_yield(rb_assoc_new(key, value));
-	}
+    for (i=0; i<RSTRUCT_LEN(s); i++) {
+	VALUE key = rb_ary_entry(members, i);
+	VALUE value = RSTRUCT_GET(s, i);
+	rb_yield_assoc_or_values(key, value);
     }
     return s;
 }