diff --git a/eval.c b/eval.c
index 1ca58271ed..74ef5030e9 100644
--- a/eval.c
+++ b/eval.c
@@ -2001,7 +2001,7 @@ call_trace_func(event, file, line, self, id, klass)
 }
 
 static VALUE
-svalue_to_mvalue(v)
+svalue_to_avalue(v)
     VALUE v;
 {
     if (NIL_P(v)) return rb_ary_new2(0);
@@ -2015,6 +2015,36 @@ svalue_to_mvalue(v)
     return v;
 }
 
+static VALUE
+avalue_to_svalue(v)
+    VALUE v;
+{
+    if (TYPE(v) != T_ARRAY) {
+	v = rb_ary_to_ary(v);
+    }
+    if (RARRAY(v)->len == 0) {
+	return Qnil;
+    }
+    if (RARRAY(v)->len == 1) {
+	return RARRAY(v)->ptr[0];
+    }
+    return v;
+}
+
+static VALUE
+svalue_to_mvalue(v)
+    VALUE v;
+{
+    if (NIL_P(v)) return rb_ary_new2(0);
+    if (TYPE(v) == T_ARRAY) {
+	return v;
+    }
+    else {
+	v = rb_ary_to_ary(v);
+    }
+    return v;
+}
+
 static VALUE
 mvalue_to_svalue(v)
     VALUE v;
@@ -2025,7 +2055,7 @@ mvalue_to_svalue(v)
     if (RARRAY(v)->len == 0) {
 	return Qnil;
     }
-    if (RARRAY(v)->len == 1) {
+    if (RARRAY(v)->len == 1 && TYPE(RARRAY(v)->ptr[0]) != T_ARRAY) {
 	return RARRAY(v)->ptr[0];
     }
     return v;
@@ -2379,17 +2409,13 @@ rb_eval(self, n)
 	result = rb_ary_to_ary(rb_eval(self, node->nd_head));
 	break;
 
-      case NODE_SVALUE:
-	result = mvalue_to_svalue(rb_eval(self, node->nd_head));
-	break;
-
-      case NODE_MVALUE:
-	result = svalue_to_mvalue(rb_eval(self, node->nd_head));
+      case NODE_REXPAND:
+	result = avalue_to_svalue(rb_eval(self, node->nd_head));
 	break;
 
       case NODE_YIELD:
 	if (node->nd_stts) {
-	    result = mvalue_to_svalue(rb_eval(self, node->nd_stts));
+	    result = avalue_to_svalue(rb_eval(self, node->nd_stts));
 	}
 	else {
 	    result = Qnil;
@@ -2532,7 +2558,7 @@ rb_eval(self, n)
 
       case NODE_RETURN:
 	if (node->nd_stts) {
- 	    return_value(mvalue_to_svalue(rb_eval(self, node->nd_stts)));
+ 	    return_value(avalue_to_svalue(rb_eval(self, node->nd_stts)));
  	}
 	else {
 	    return_value(Qnil);
@@ -3630,6 +3656,7 @@ rb_yield_0(val, self, klass, pcall)
 		    massign(self, block->var, val, pcall);
 		}
 		else {
+		    if (pcall) val = avalue_to_svalue(val);
 		    assign(self, block->var, val, pcall);
 		}
 	    }
@@ -3637,6 +3664,9 @@ rb_yield_0(val, self, klass, pcall)
 	POP_TAG();
 	if (state) goto pop_state;
     }
+    else if (pcall) {
+	val = avalue_to_svalue(val);
+    }
 
     PUSH_ITER(block->iter);
     PUSH_TAG(PROT_NONE);
@@ -3738,7 +3768,9 @@ massign(self, node, val, pcall)
     NODE *list;
     int i = 0, len;
 
-    val = svalue_to_mvalue(val);
+    if (!pcall) {
+	val = svalue_to_mvalue(val);
+    }
     len = RARRAY(val)->len;
     list = node->nd_head;
     for (i=0; list && i<len; i++) {
@@ -6339,7 +6371,9 @@ proc_invoke(proc, args, pcall)
     PUSH_ITER(ITER_CUR);
     ruby_frame->iter = ITER_CUR;
 
-    args = mvalue_to_svalue(args);
+    if (!pcall) {
+	args = avalue_to_svalue(args);
+    }
     PUSH_TAG(PROT_NONE);
     state = EXEC_TAG();
     if (state == 0) {
@@ -6811,7 +6845,7 @@ static VALUE
 bmcall(args, method)
     VALUE args, method;
 {
-    args = svalue_to_mvalue(args);
+    args = svalue_to_avalue(args);
     return method_call(RARRAY(args)->len, RARRAY(args)->ptr, method);
 }
 
diff --git a/lib/debug.rb b/lib/debug.rb
index 9e777952ad..2216f3a4df 100644
--- a/lib/debug.rb
+++ b/lib/debug.rb
@@ -195,7 +195,7 @@ class DEBUGGER__
 
       when /^\s*i(?:nstance)?\s+/
 	obj = debug_eval($', binding)
-	var_list(obj.instance_variables, binding)
+	var_list(obj.instance_variables, obj.instance_eval{binding()})
 
       when /^\s*c(?:onst(?:ant)?)?\s+/
 	obj = debug_eval($', binding)
diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el
index da31f989d1..d29e3bd82c 100644
--- a/misc/ruby-mode.el
+++ b/misc/ruby-mode.el
@@ -750,6 +750,10 @@ An end of a defun is found by moving forward from the beginning of one."
 	     "\\|")
 	    "\\)\\>\\([^_]\\|$\\)")
 	   2)
+     ;; regexps
+     '("/\\(\\(\\\\/\\|[^/\n]\\)*\\)/\\([iop]*\\)"
+       (1 font-lock-string-face)
+       (3 font-lock-constant-face))
      ;; variables
      '("\\(^\\|[^_:.@$]\\|\\.\\.\\)\\b\\(nil\\|self\\|true\\|false\\)\\b\\([^_]\\|$\\)"
        2 font-lock-variable-name-face)
diff --git a/node.h b/node.h
index ea75763c08..d39a5a9a93 100644
--- a/node.h
+++ b/node.h
@@ -90,8 +90,7 @@ enum node_type {
     NODE_ARGSPUSH,
     NODE_RESTARGS,
     NODE_RESTARY,
-    NODE_SVALUE,
-    NODE_MVALUE,
+    NODE_REXPAND,
     NODE_BLOCK_ARG,
     NODE_BLOCK_PASS,
     NODE_DEFN,
@@ -308,8 +307,7 @@ typedef struct RNode {
 #define NEW_ARGSPUSH(a,b) rb_node_newnode(NODE_ARGSPUSH,a,b,0)
 #define NEW_RESTARGS(a) rb_node_newnode(NODE_RESTARGS,a,0,0)
 #define NEW_RESTARY(a) rb_node_newnode(NODE_RESTARY,a,0,0)
-#define NEW_SVALUE(a) rb_node_newnode(NODE_SVALUE,a,0,0)
-#define NEW_MVALUE(a) rb_node_newnode(NODE_MVALUE,a,0,0)
+#define NEW_REXPAND(a) rb_node_newnode(NODE_REXPAND,a,0,0)
 #define NEW_BLOCK_ARG(v) rb_node_newnode(NODE_BLOCK_ARG,v,0,local_cnt(v))
 #define NEW_BLOCK_PASS(b) rb_node_newnode(NODE_BLOCK_PASS,0,b,0)
 #define NEW_ALIAS(n,o) rb_node_newnode(NODE_ALIAS,o,n,0)
diff --git a/parse.y b/parse.y
index bf9fd07067..4a30d345cd 100644
--- a/parse.y
+++ b/parse.y
@@ -426,7 +426,7 @@ stmt		: kALIAS fitem {lex_state = EXPR_FNAME;} fitem
 		    }
 		| lhs '=' mrhs_basic
 		    {
-			$$ = node_assign($1, NEW_SVALUE($3));
+			$$ = node_assign($1, NEW_REXPAND($3));
 		    }
 		| mlhs '=' mrhs
 		    {
@@ -1134,7 +1134,7 @@ mrhs		: arg
 		    }
 		| mrhs_basic
 		    {
-			$$ = NEW_SVALUE($1);
+			$$ = NEW_REXPAND($1);
 		    }
 
 mrhs_basic	: args ',' arg
diff --git a/sample/test.rb b/sample/test.rb
index f8edd3a44a..6c352fa083 100644
--- a/sample/test.rb
+++ b/sample/test.rb
@@ -64,12 +64,12 @@ a = *[*[1,2]]; test_ok(a == [1,2])
 
 *a = nil; test_ok(a == [])
 *a = 1; test_ok(a == [1])
-*a = []; test_ok(a == [[]])
-*a = [1]; test_ok(a == [[1]])
-*a = [nil]; test_ok(a == [[nil]])
-*a = [[]]; test_ok(a == [[[]]])
-*a = [*[]]; test_ok(a == [[]])
-*a = [*[1]]; test_ok(a == [[1]])
+*a = []; test_ok(a == [])
+*a = [1]; test_ok(a == [1])
+*a = [nil]; test_ok(a == [nil])
+*a = [[]]; test_ok(a == [[]])
+*a = [*[]]; test_ok(a == [])
+*a = [*[1]]; test_ok(a == [1])
 *a = [*[1,2]]; test_ok(a == [1,2])
 
 *a = *nil; test_ok(a == [])
@@ -77,19 +77,19 @@ a = *[*[1,2]]; test_ok(a == [1,2])
 *a = *[]; test_ok(a == [])
 *a = *[1]; test_ok(a == [1])
 *a = *[nil]; test_ok(a == [])
-*a = *[[]]; test_ok(a == [[]])
+*a = *[[]]; test_ok(a == [])
 *a = *[*[]]; test_ok(a == [])
 *a = *[*[1]]; test_ok(a == [1])
 *a = *[*[1,2]]; test_ok(a == [1,2])
 
 a,b,*c = nil; test_ok([a,b,c] == [nil, nil, []])
 a,b,*c = 1; test_ok([a,b,c] == [1, nil, []])
-a,b,*c = []; test_ok([a,b,c] == [[], nil, []])
-a,b,*c = [1]; test_ok([a,b,c] == [[1], nil, []])
-a,b,*c = [nil]; test_ok([a,b,c] == [[nil], nil, []])
-a,b,*c = [[]]; test_ok([a,b,c] == [[[]], nil, []])
-a,b,*c = [*[]]; test_ok([a,b,c] == [[], nil, []])
-a,b,*c = [*[1]]; test_ok([a,b,c] == [[1], nil, []])
+a,b,*c = []; test_ok([a,b,c] == [nil, nil, []])
+a,b,*c = [1]; test_ok([a,b,c] == [1, nil, []])
+a,b,*c = [nil]; test_ok([a,b,c] == [nil, nil, []])
+a,b,*c = [[]]; test_ok([a,b,c] == [[], nil, []])
+a,b,*c = [*[]]; test_ok([a,b,c] == [nil, nil, []])
+a,b,*c = [*[1]]; test_ok([a,b,c] == [1, nil, []])
 a,b,*c = [*[1,2]]; test_ok([a,b,c] == [1, 2, []])
 
 a,b,*c = *nil; test_ok([a,b,c] == [nil, nil, []])
@@ -97,7 +97,7 @@ a,b,*c = *1; test_ok([a,b,c] == [1, nil, []])
 a,b,*c = *[]; test_ok([a,b,c] == [nil, nil, []])
 a,b,*c = *[1]; test_ok([a,b,c] == [1, nil, []])
 a,b,*c = *[nil]; test_ok([a,b,c] == [nil, nil, []])
-a,b,*c = *[[]]; test_ok([a,b,c] == [[], nil, []])
+a,b,*c = *[[]]; test_ok([a,b,c] == [nil, nil, []])
 a,b,*c = *[*[]]; test_ok([a,b,c] == [nil, nil, []])
 a,b,*c = *[*[1]]; test_ok([a,b,c] == [1, nil, []])
 a,b,*c = *[*[1,2]]; test_ok([a,b,c] == [1, 2, []])
@@ -124,12 +124,12 @@ def f; yield *[*[1,2]]; end; f {|a| test_ok(a == [1,2])}
 
 def f; yield nil; end; f {|*a| test_ok(a == [])}
 def f; yield 1; end; f {|*a| test_ok(a == [1])}
-def f; yield []; end; f {|*a| test_ok(a == [[]])}
-def f; yield [1]; end; f {|*a| test_ok(a == [[1]])}
-def f; yield [nil]; end; f {|*a| test_ok(a == [[nil]])}
-def f; yield [[]]; end; f {|*a| test_ok(a == [[[]]])}
-def f; yield [*[]]; end; f {|*a| test_ok(a == [[]])}
-def f; yield [*[1]]; end; f {|*a| test_ok(a == [[1]])}
+def f; yield []; end; f {|*a| test_ok(a == [])}
+def f; yield [1]; end; f {|*a| test_ok(a == [1])}
+def f; yield [nil]; end; f {|*a| test_ok(a == [nil])}
+def f; yield [[]]; end; f {|*a| test_ok(a == [[]])}
+def f; yield [*[]]; end; f {|*a| test_ok(a == [])}
+def f; yield [*[1]]; end; f {|*a| test_ok(a == [1])}
 def f; yield [*[1,2]]; end; f {|*a| test_ok(a == [1,2])}
 
 def f; yield *nil; end; f {|*a| test_ok(a == [])}
@@ -137,19 +137,19 @@ def f; yield *1; end; f {|*a| test_ok(a == [1])}
 def f; yield *[]; end; f {|*a| test_ok(a == [])}
 def f; yield *[1]; end; f {|*a| test_ok(a == [1])}
 def f; yield *[nil]; end; f {|*a| test_ok(a == [])}
-def f; yield *[[]]; end; f {|*a| test_ok(a == [[]])}
+def f; yield *[[]]; end; f {|*a| test_ok(a == [])}
 def f; yield *[*[]]; end; f {|*a| test_ok(a == [])}
 def f; yield *[*[1]]; end; f {|*a| test_ok(a == [1])}
 def f; yield *[*[1,2]]; end; f {|*a| test_ok(a == [1,2])}
 
 def f; yield nil; end; f {|a,b,*c| test_ok([a,b,c] == [nil, nil, []])}
 def f; yield 1; end; f {|a,b,*c| test_ok([a,b,c] == [1, nil, []])}
-def f; yield []; end; f {|a,b,*c| test_ok([a,b,c] == [[], nil, []])}
-def f; yield [1]; end; f {|a,b,*c| test_ok([a,b,c] == [[1], nil, []])}
-def f; yield [nil]; end; f {|a,b,*c| test_ok([a,b,c] == [[nil], nil, []])}
-def f; yield [[]]; end; f {|a,b,*c| test_ok([a,b,c] == [[[]], nil, []])}
-def f; yield [*[]]; end; f {|a,b,*c| test_ok([a,b,c] == [[], nil, []])}
-def f; yield [*[1]]; end; f {|a,b,*c| test_ok([a,b,c] == [[1], nil, []])}
+def f; yield []; end; f {|a,b,*c| test_ok([a,b,c] == [nil, nil, []])}
+def f; yield [1]; end; f {|a,b,*c| test_ok([a,b,c] == [1, nil, []])}
+def f; yield [nil]; end; f {|a,b,*c| test_ok([a,b,c] == [nil, nil, []])}
+def f; yield [[]]; end; f {|a,b,*c| test_ok([a,b,c] == [[], nil, []])}
+def f; yield [*[]]; end; f {|a,b,*c| test_ok([a,b,c] == [nil, nil, []])}
+def f; yield [*[1]]; end; f {|a,b,*c| test_ok([a,b,c] == [1, nil, []])}
 def f; yield [*[1,2]]; end; f {|a,b,*c| test_ok([a,b,c] == [1, 2, []])}
 
 def f; yield *nil; end; f {|a,b,*c| test_ok([a,b,c] == [nil, nil, []])}
@@ -157,7 +157,7 @@ def f; yield *1; end; f {|a,b,*c| test_ok([a,b,c] == [1, nil, []])}
 def f; yield *[]; end; f {|a,b,*c| test_ok([a,b,c] == [nil, nil, []])}
 def f; yield *[1]; end; f {|a,b,*c| test_ok([a,b,c] == [1, nil, []])}
 def f; yield *[nil]; end; f {|a,b,*c| test_ok([a,b,c] == [nil, nil, []])}
-def f; yield *[[]]; end; f {|a,b,*c| test_ok([a,b,c] == [[], nil, []])}
+def f; yield *[[]]; end; f {|a,b,*c| test_ok([a,b,c] == [nil, nil, []])}
 def f; yield *[*[]]; end; f {|a,b,*c| test_ok([a,b,c] == [nil, nil, []])}
 def f; yield *[*[1]]; end; f {|a,b,*c| test_ok([a,b,c] == [1, nil, []])}
 def f; yield *[*[1,2]]; end; f {|a,b,*c| test_ok([a,b,c] == [1, 2, []])}
@@ -666,17 +666,17 @@ test_ok($x == 8)
 IterTest.new([[0]]).each0 { |x| $x = x }
 test_ok($x == [0])
 IterTest.new([[1]]).each1 { |x| $x = x }
-test_ok($x == [1])
+test_ok($x == 1)
 IterTest.new([[2]]).each2 { |x| $x = x }
-test_ok($x == [[2]])
+test_ok($x == [2])
 IterTest.new([[3]]).each3 { |x| $x = x }
 test_ok($x == 3)
 IterTest.new([[4]]).each4 { |x| $x = x }
 test_ok($x == [4])
 IterTest.new([[5]]).each5 { |x| $x = x }
-test_ok($x == [5])
+test_ok($x == 5)
 IterTest.new([[6]]).each6 { |x| $x = x }
-test_ok($x == [[6]])
+test_ok($x == [6])
 IterTest.new([[7]]).each7 { |x| $x = x }
 test_ok($x == 7)
 IterTest.new([[8]]).each8 { |x| $x = x }