6 files changed, 10 insertions, 26 deletions
diff --git a/global.sym b/global.sym
index 497e1c4ea5..f7d11f22ad 100644
--- a/global.sym
+++ b/global.sym
@@ -200,7 +200,6 @@ rsfp
 rsfp_filters
 rshift_amg
 rshift_ass_amg
-runops
 savestack
 savestack_ix
 savestack_max
@@ -1016,6 +1015,7 @@ rsignal
 rsignal_save
 rsignal_state
 rsignal_restore
+runops
 rxres_free
 rxres_restore
 rxres_save
@@ -1096,7 +1096,6 @@ sv_2uv
 sv_add_arena
 sv_backoff
 sv_bless
-sv_bless3
 sv_catpvf
 sv_catpv
 sv_catpvn
diff --git a/perl.h b/perl.h
index 70d9a63f43..5ef7cd95de 100644
--- a/perl.h
+++ b/perl.h
@@ -1314,10 +1314,8 @@ typedef Sighandler_t Sigsave_t;
 #  endif
 # endif
 # define PAD_SV(po) pad_sv(po)
-# define RUNOPS_DEFAULT runops_debug
 #else
 # define PAD_SV(po) curpad[po]
-# define RUNOPS_DEFAULT runops_standard
 #endif
 
 /****************/
@@ -1394,7 +1392,6 @@ EXT OP *	opsave;		/* save current op register across longjmps */
 #else
 EXT OP *	op;		/* current op--when not in a global register */
 #endif
-EXT int		(*runops) _((void)) INIT(RUNOPS_DEFAULT);
 EXT I32 *	scopestack;	/* blocks we've entered */
 EXT I32		scopestack_ix;
 EXT I32		scopestack_max;
diff --git a/pp.c b/pp.c
index ff00688c7a..01c61c25a1 100644
--- a/pp.c
+++ b/pp.c
@@ -426,7 +426,7 @@ PP(pp_bless)
     else
 	stash = gv_stashsv(POPs, TRUE);
 
-    (void)sv_bless3(TOPs, stash, TRUE);
+    (void)sv_bless(TOPs, stash);
     RETURN;
 }
 
diff --git a/proto.h b/proto.h
index 4c51fdc2be..4565ec4a82 100644
--- a/proto.h
+++ b/proto.h
@@ -398,10 +398,7 @@ Sighandler_t rsignal _((int, Sighandler_t));
 int	rsignal_restore _((int, Sigsave_t*));
 int	rsignal_save _((int, Sighandler_t, Sigsave_t*));
 Sighandler_t rsignal_state _((int));
-int	runops_standard _((void));
-#ifdef DEBUGGING
-int	runops_debug _((void));
-#endif
+int	runops _((void));
 void	rxres_free _((void** rsp));
 void	rxres_restore _((void** rsp, REGEXP* rx));
 void	rxres_save _((void** rsp, REGEXP* rx));
@@ -468,7 +465,6 @@ UV	sv_2uv _((SV* sv));
 void	sv_add_arena _((char* ptr, U32 size, U32 flags));
 int	sv_backoff _((SV* sv));
 SV*	sv_bless _((SV* sv, HV* stash));
-SV*	sv_bless3 _((SV* sv, HV* stash, bool zaptilde));
 void	sv_catpvf _((SV* sv, const char* pat, ...));
 void	sv_catpv _((SV* sv, char* ptr));
 void	sv_catpvn _((SV* sv, char* ptr, STRLEN len));
diff --git a/run.c b/run.c
index 1e1001d4ad..2f8d8fa971 100644
--- a/run.c
+++ b/run.c
@@ -19,8 +19,10 @@
 dEXT char **watchaddr = 0;
 dEXT char *watchok;
 
+#ifndef DEBUGGING
+
 int
-runops_standard() {
+runops() {
     dTHR;
     SAVEI32(runlevel);
     runlevel++;
@@ -31,11 +33,12 @@ runops_standard() {
     return 0;
 }
 
-#ifdef DEBUGGING
+#else
+
 static void debprof _((OP*o));
 
 int
-runops_debug() {
+runops() {
     dTHR;
     if (!op) {
 	warn("NULL OP IN RUN");
diff --git a/sv.c b/sv.c
index 1c58c46aaa..cd55f817e6 100644
--- a/sv.c
+++ b/sv.c
@@ -4043,10 +4043,9 @@ I32 n;
 }
 
 SV*
-sv_bless3(sv,stash,zaptilde)
+sv_bless(sv,stash)
 SV* sv;
 HV* stash;
-bool zaptilde;
 {
     dTHR;
     SV *ref;
@@ -4059,8 +4058,6 @@ bool zaptilde;
 	if (SvOBJECT(ref)) {
 	    if (SvTYPE(ref) != SVt_PVIO)
 		--sv_objcount;
-	    if (zaptilde && SvRMAGICAL(ref))
-		sv_unmagic(ref, '~');	/* stop cross-class pointer forgery */
 	    SvREFCNT_dec(SvSTASH(ref));
 	}
     }
@@ -4080,14 +4077,6 @@ bool zaptilde;
     return sv;
 }
 
-SV*
-sv_bless(sv,stash)
-SV* sv;
-HV* stash;
-{
-    return sv_bless3(sv, stash, FALSE);
-}
-
 static void
 sv_unglob(sv)
 SV* sv;