2 files changed, 5 insertions, 5 deletions
diff --git a/hv.c b/hv.c
index dfa0498baa..e495e91769 100644
--- a/hv.c
+++ b/hv.c
@@ -233,7 +233,6 @@ bool *needs_store;
 	    case 'I':
 	    case 'S':
 		*needs_store = FALSE;
-	    default:
 	    }
 	}
 	mg = mg->mg_moremagic;
diff --git a/pp_ctl.c b/pp_ctl.c
index d79145c719..d9f985e8e4 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -546,11 +546,12 @@ PP(pp_grepstart)
     ENTER;					/* enter outer scope */
 
     SAVETMPS;
-#if 0
-    SAVE_DEFSV;
-#else
+#ifdef USE_THREADS
+    /* SAVE_DEFSV does *not* suffice here */
     save_sptr(av_fetch(thr->threadsv, find_threadsv("_"), FALSE));
-#endif
+#else
+    SAVESPTR(GvSV(defgv));
+#endif /* USE_THREADS */
     ENTER;					/* enter inner scope */
     SAVESPTR(curpm);