diff --git a/ChangeLog b/ChangeLog
index fb7d6ab70b..906eef96b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Thu Jun 19 17:37:21 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (str_alloc): specify 'inline' modifier.
+
+	* string.c (str_alloc): remove cSymbol hack that no longer
+	  necessary. 
+
+	* string.c (scan_once): avoid retrieving encoding info unless
+	  necessary.
+
 Thu Jun 19 17:19:14 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_scan): String#scan should preserve last
diff --git a/string.c b/string.c
index 3949a6e33a..f3207d7077 100644
--- a/string.c
+++ b/string.c
@@ -336,16 +336,12 @@ str_frozen_check(VALUE s)
     }
 }
 
-static VALUE
+static inline VALUE
 str_alloc(VALUE klass)
 {
     NEWOBJ(str, struct RString);
     OBJSETUP(str, klass, T_STRING);
 
-    if (klass == rb_cSymbol) {
-	/* need to be registered in table */
-	RBASIC(str)->klass = rb_cString;
-    }
     str->as.heap.ptr = 0;
     str->as.heap.len = 0;
     str->as.heap.aux.capa = 0;
@@ -5617,16 +5613,15 @@ rb_str_strip(VALUE str)
 static VALUE
 scan_once(VALUE str, VALUE pat, long *start)
 {
-    rb_encoding *enc;
     VALUE result, match;
     struct re_registers *regs;
     long i;
 
-    enc = STR_ENC_GET(str);
     if (rb_reg_search(pat, str, *start, 0) >= 0) {
 	match = rb_backref_get();
 	regs = RMATCH_REGS(match);
 	if (BEG(0) == END(0)) {
+	    rb_encoding *enc = STR_ENC_GET(str);
 	    /*
 	     * Always consume at least one character of the input string
 	     */