diff --git a/ChangeLog b/ChangeLog
index e95db1b955..f496bb24f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep  2 07:42:15 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/instruction.rb (RubyVM::InstructionsLoader#make_stackcaching_insns):
+	  simplified.
+
 Wed Sep  2 02:32:46 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/json/lib/json/common.rb (NaN): Change definition
diff --git a/tool/instruction.rb b/tool/instruction.rb
index 8d55683da3..1a09ab347c 100644
--- a/tool/instruction.rb
+++ b/tool/instruction.rb
@@ -1,4 +1,4 @@
-#
+#!./miniruby
 #
 #
 
@@ -505,14 +505,9 @@ class RubyVM
         orets = insn.rets
         oopes = insn.opes
         ocomm = insn.comm
+        oname = insn.name
 
-        after = nil
-        SPECIAL_INSN_FOR_SC_AFTER.any?{|k, v|
-          if k =~ insn.name
-            after = v
-            break
-          end
-        }
+        after = SPECIAL_INSN_FOR_SC_AFTER.find {|k, v| k =~ oname}
 
         insns = []
         FROM_SC.each{|from|