diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c
index 3a4b5900b90..2602fb59a3b 100644
--- a/ext/standard/url_scanner_ex.c
+++ b/ext/standard/url_scanner_ex.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.10 on Tue Nov  8 02:01:27 2005 */
+/* Generated by re2c 0.9.10 on Tue Nov  8 14:06:23 2005 */
 #line 1 "ext/standard/url_scanner_ex.re"
 /*
   +----------------------------------------------------------------------+
@@ -145,7 +145,7 @@ scan:
 	128, 128, 128, 128, 128, 128, 128, 128, 
 	};
 
-#line 149 "<stdout>"
+#line 149 "ext/standard/url_scanner_ex.c"
 {
 	YYCTYPE yych;
 	goto yy0;
@@ -164,19 +164,19 @@ yy2:	++YYCURSOR;
 yy3:
 #line 115 "ext/standard/url_scanner_ex.re"
 { smart_str_append(dest, url); return; }
-#line 168 "<stdout>"
+#line 168 "ext/standard/url_scanner_ex.c"
 yy4:	++YYCURSOR;
 	goto yy5;
 yy5:
 #line 116 "ext/standard/url_scanner_ex.re"
 { sep = separator; goto scan; }
-#line 174 "<stdout>"
+#line 174 "ext/standard/url_scanner_ex.c"
 yy6:	++YYCURSOR;
 	goto yy7;
 yy7:
 #line 117 "ext/standard/url_scanner_ex.re"
 { bash = p - 1; goto done; }
-#line 180 "<stdout>"
+#line 180 "ext/standard/url_scanner_ex.c"
 yy8:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
@@ -188,7 +188,7 @@ yy9:	if(yybm[0+yych] & 128) {
 yy10:
 #line 118 "ext/standard/url_scanner_ex.re"
 { goto scan; }
-#line 192 "<stdout>"
+#line 192 "ext/standard/url_scanner_ex.c"
 }
 }
 #line 119 "ext/standard/url_scanner_ex.re"
@@ -395,7 +395,7 @@ state_plain:
 	128, 128, 128, 128, 128, 128, 128, 128, 
 	};
 
-#line 399 "<stdout>"
+#line 399 "ext/standard/url_scanner_ex.c"
 {
 	YYCTYPE yych;
 	goto yy11;
@@ -412,7 +412,7 @@ yy13:	++YYCURSOR;
 yy14:
 #line 287 "ext/standard/url_scanner_ex.re"
 { passthru(STD_ARGS); STATE = STATE_TAG; goto state_tag; }
-#line 416 "<stdout>"
+#line 416 "ext/standard/url_scanner_ex.c"
 yy15:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
@@ -424,7 +424,7 @@ yy16:	if(yybm[0+yych] & 128) {
 yy17:
 #line 288 "ext/standard/url_scanner_ex.re"
 { passthru(STD_ARGS); goto state_plain; }
-#line 428 "<stdout>"
+#line 428 "ext/standard/url_scanner_ex.c"
 }
 }
 #line 289 "ext/standard/url_scanner_ex.re"
@@ -468,7 +468,7 @@ state_tag:
 	  0,   0,   0,   0,   0,   0,   0,   0, 
 	};
 
-#line 472 "<stdout>"
+#line 472 "ext/standard/url_scanner_ex.c"
 {
 	YYCTYPE yych;
 	goto yy18;
@@ -487,13 +487,13 @@ yy20:	++YYCURSOR;
 yy21:
 #line 294 "ext/standard/url_scanner_ex.re"
 { handle_tag(STD_ARGS); /* Sets STATE */; passthru(STD_ARGS); if (STATE == STATE_PLAIN) goto state_plain; else goto state_next_arg; }
-#line 491 "<stdout>"
+#line 491 "ext/standard/url_scanner_ex.c"
 yy22:	++YYCURSOR;
 	goto yy23;
 yy23:
 #line 295 "ext/standard/url_scanner_ex.re"
 { passthru(STD_ARGS); goto state_plain_begin; }
-#line 497 "<stdout>"
+#line 497 "ext/standard/url_scanner_ex.c"
 yy24:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
@@ -548,7 +548,7 @@ state_next_arg:
 	  0,   0,   0,   0,   0,   0,   0,   0, 
 	};
 
-#line 552 "<stdout>"
+#line 552 "ext/standard/url_scanner_ex.c"
 {
 	YYCTYPE yych;
 	goto yy26;
@@ -580,26 +580,26 @@ yy28:	++YYCURSOR;
 yy29:
 #line 304 "ext/standard/url_scanner_ex.re"
 { passthru(STD_ARGS); handle_form(STD_ARGS); goto state_plain_begin; }
-#line 584 "<stdout>"
+#line 584 "ext/standard/url_scanner_ex.c"
 yy30:	++YYCURSOR;
 	yych = *YYCURSOR;
 	goto yy37;
 yy31:
 #line 305 "ext/standard/url_scanner_ex.re"
 { passthru(STD_ARGS); goto state_next_arg; }
-#line 591 "<stdout>"
+#line 591 "ext/standard/url_scanner_ex.c"
 yy32:	++YYCURSOR;
 	goto yy33;
 yy33:
 #line 306 "ext/standard/url_scanner_ex.re"
 { --YYCURSOR; STATE = STATE_ARG; goto state_arg; }
-#line 597 "<stdout>"
+#line 597 "ext/standard/url_scanner_ex.c"
 yy34:	++YYCURSOR;
 	goto yy35;
 yy35:
 #line 307 "ext/standard/url_scanner_ex.re"
 { passthru(STD_ARGS); goto state_plain_begin; }
-#line 603 "<stdout>"
+#line 603 "ext/standard/url_scanner_ex.c"
 yy36:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
@@ -651,7 +651,7 @@ state_arg:
 	  0,   0,   0,   0,   0,   0,   0,   0, 
 	};
 
-#line 655 "<stdout>"
+#line 655 "ext/standard/url_scanner_ex.c"
 {
 	YYCTYPE yych;
 	goto yy38;
@@ -670,13 +670,13 @@ yy40:	++YYCURSOR;
 yy41:
 #line 313 "ext/standard/url_scanner_ex.re"
 { passthru(STD_ARGS); handle_arg(STD_ARGS); STATE = STATE_BEFORE_VAL; goto state_before_val; }
-#line 674 "<stdout>"
+#line 674 "ext/standard/url_scanner_ex.c"
 yy42:	++YYCURSOR;
 	goto yy43;
 yy43:
 #line 314 "ext/standard/url_scanner_ex.re"
 { passthru(STD_ARGS); STATE = STATE_NEXT_ARG; goto state_next_arg; }
-#line 680 "<stdout>"
+#line 680 "ext/standard/url_scanner_ex.c"
 yy44:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
@@ -728,7 +728,7 @@ state_before_val:
 	  0,   0,   0,   0,   0,   0,   0,   0, 
 	};
 
-#line 732 "<stdout>"
+#line 732 "ext/standard/url_scanner_ex.c"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
@@ -748,14 +748,14 @@ yy48:	yyaccept = 0;
 yy49:
 #line 321 "ext/standard/url_scanner_ex.re"
 { --YYCURSOR; goto state_next_arg_begin; }
-#line 752 "<stdout>"
+#line 752 "ext/standard/url_scanner_ex.c"
 yy50:	++YYCURSOR;
 	yych = *YYCURSOR;
 	goto yy54;
 yy51:
 #line 320 "ext/standard/url_scanner_ex.re"
 { passthru(STD_ARGS); STATE = STATE_VAL; goto state_val; }
-#line 759 "<stdout>"
+#line 759 "ext/standard/url_scanner_ex.c"
 yy52:	yych = *++YYCURSOR;
 	goto yy49;
 yy53:	++YYCURSOR;
@@ -821,7 +821,7 @@ state_val:
 	248, 248, 248, 248, 248, 248, 248, 248, 
 	};
 
-#line 825 "<stdout>"
+#line 825 "ext/standard/url_scanner_ex.c"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
@@ -854,7 +854,7 @@ yy60:	yyaccept = 0;
 yy61:
 #line 330 "ext/standard/url_scanner_ex.re"
 { handle_val(STD_ARGS, 0, '\0'); goto state_next_arg_begin; }
-#line 858 "<stdout>"
+#line 858 "ext/standard/url_scanner_ex.c"
 yy62:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	goto yy69;
@@ -865,7 +865,7 @@ yy64:	++YYCURSOR;
 yy65:
 #line 331 "ext/standard/url_scanner_ex.re"
 { passthru(STD_ARGS); goto state_next_arg_begin; }
-#line 869 "<stdout>"
+#line 869 "ext/standard/url_scanner_ex.c"
 yy66:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
@@ -894,7 +894,7 @@ yy70:	++YYCURSOR;
 yy71:
 #line 329 "ext/standard/url_scanner_ex.re"
 { handle_val(STD_ARGS, 1, '\''); goto state_next_arg_begin; }
-#line 898 "<stdout>"
+#line 898 "ext/standard/url_scanner_ex.c"
 yy72:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
@@ -930,7 +930,7 @@ yy78:	++YYCURSOR;
 yy79:
 #line 328 "ext/standard/url_scanner_ex.re"
 { handle_val(STD_ARGS, 1, '"'); goto state_next_arg_begin; }
-#line 934 "<stdout>"
+#line 934 "ext/standard/url_scanner_ex.c"
 yy80:	++YYCURSOR;
 	if(YYLIMIT == YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index da18e2deac5..6d91872250c 100644
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.9.10 on Tue Nov  8 02:01:41 2005 */
+/* Generated by re2c 0.9.10 on Tue Nov  8 14:06:09 2005 */
 #line 1 "ext/standard/var_unserializer.re"
 /*
   +----------------------------------------------------------------------+
@@ -390,7 +390,7 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
 	  0,   0,   0,   0,   0,   0,   0,   0, 
 	};
 
-#line 394 "<stdout>"
+#line 394 "ext/standard/var_unserializer.c"
 {
 	YYCTYPE yych;
 	unsigned int yyaccept;
@@ -420,7 +420,7 @@ yy2:	yyaccept = 0;
 yy3:
 #line 626 "ext/standard/var_unserializer.re"
 { return 0; }
-#line 424 "<stdout>"
+#line 424 "ext/standard/var_unserializer.c"
 yy4:	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == ':')	goto yy81;
@@ -465,7 +465,7 @@ yy14:
 	php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unexpected end of serialized data");
 	return 0; /* not sure if it should be 0 or 1 here? */
 }
-#line 469 "<stdout>"
+#line 469 "ext/standard/var_unserializer.c"
 yy15:	yych = *++YYCURSOR;
 	goto yy3;
 yy16:	yych = *++YYCURSOR;
@@ -610,7 +610,7 @@ yy23:
 
 	return object_common2(UNSERIALIZE_PASSTHRU, elements);
 }
-#line 614 "<stdout>"
+#line 614 "ext/standard/var_unserializer.c"
 yy24:	yych = *++YYCURSOR;
 	if(yych <= ','){
 		if(yych != '+')	goto yy17;
@@ -647,7 +647,7 @@ yy30:
 	return object_common2(UNSERIALIZE_PASSTHRU,
 			object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR));
 }
-#line 651 "<stdout>"
+#line 651 "ext/standard/var_unserializer.c"
 yy31:	yych = *++YYCURSOR;
 	if(yych == '+')	goto yy32;
 	if(yych <= '/')	goto yy17;
@@ -693,7 +693,7 @@ yy37:
 
 	return finish_nested_data(UNSERIALIZE_PASSTHRU);
 }
-#line 697 "<stdout>"
+#line 697 "ext/standard/var_unserializer.c"
 yy38:	yych = *++YYCURSOR;
 	if(yych == '+')	goto yy39;
 	if(yych <= '/')	goto yy17;
@@ -745,7 +745,7 @@ yy44:
 	ZVAL_STRINGL(*rval, str, len, 1);
 	return 1;
 }
-#line 749 "<stdout>"
+#line 749 "ext/standard/var_unserializer.c"
 yy45:	yych = *++YYCURSOR;
 	if(yych <= '/'){
 		if(yych <= ','){
@@ -841,7 +841,7 @@ yy56:
 	ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL));
 	return 1;
 }
-#line 845 "<stdout>"
+#line 845 "ext/standard/var_unserializer.c"
 yy57:	yych = *++YYCURSOR;
 	if(yych <= ','){
 		if(yych != '+')	goto yy17;
@@ -916,7 +916,7 @@ yy67:
 
 	return 1;
 }
-#line 920 "<stdout>"
+#line 920 "ext/standard/var_unserializer.c"
 yy68:	yych = *++YYCURSOR;
 	if(yych == 'N')	goto yy65;
 	goto yy17;
@@ -952,7 +952,7 @@ yy74:
 	ZVAL_LONG(*rval, parse_iv(start + 2));
 	return 1;
 }
-#line 956 "<stdout>"
+#line 956 "ext/standard/var_unserializer.c"
 yy75:	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy17;
 	if(yych >= '2')	goto yy17;
@@ -970,7 +970,7 @@ yy78:
 	ZVAL_BOOL(*rval, parse_iv(start + 2));
 	return 1;
 }
-#line 974 "<stdout>"
+#line 974 "ext/standard/var_unserializer.c"
 yy79:	++YYCURSOR;
 	goto yy80;
 yy80:
@@ -981,7 +981,7 @@ yy80:
 	ZVAL_NULL(*rval);
 	return 1;
 }
-#line 985 "<stdout>"
+#line 985 "ext/standard/var_unserializer.c"
 yy81:	yych = *++YYCURSOR;
 	if(yych <= ','){
 		if(yych != '+')	goto yy17;
@@ -1030,7 +1030,7 @@ yy86:
 	
 	return 1;
 }
-#line 1034 "<stdout>"
+#line 1034 "ext/standard/var_unserializer.c"
 yy87:	yych = *++YYCURSOR;
 	if(yych <= ','){
 		if(yych != '+')	goto yy17;
@@ -1077,7 +1077,7 @@ yy92:
 	
 	return 1;
 }
-#line 1081 "<stdout>"
+#line 1081 "ext/standard/var_unserializer.c"
 }
 }
 #line 628 "ext/standard/var_unserializer.re"