diff --git a/src/mzscheme/gc2/sighand.c b/src/mzscheme/gc2/sighand.c
index 9110a10bf5..f7821d8c1f 100644
--- a/src/mzscheme/gc2/sighand.c
+++ b/src/mzscheme/gc2/sighand.c
@@ -118,20 +118,17 @@ static void initialize_signal_handler(GCTYPE *gc)
 # ifdef NEED_SIGWIN
   {
     HMODULE hm;
-    PVOID (WINAPI*aveh)(ULONG, gcPVECTORED_EXCEPTION_HANDLER);
 
     hm = LoadLibrary("kernel32.dll");
-    if (hm)
+    if (hm) {
+      PVOID (WINAPI*aveh)(ULONG, gcPVECTORED_EXCEPTION_HANDLER);
       aveh = (PVOID (WINAPI*)(ULONG, gcPVECTORED_EXCEPTION_HANDLER))GetProcAddress(hm, "AddVectoredExceptionHandler");
-    else
-      aveh = NULL;
-    if (aveh)
       aveh(TRUE, fault_handler);
-    else
+    }
+    else  /* WINDOWS 95 */
       gc->generations_available = 0;
   }
 # endif
-}
 
 static void remove_signal_handler(GCTYPE *gc)
 {
@@ -150,15 +147,13 @@ static void remove_signal_handler(GCTYPE *gc)
 # ifdef NEED_SIGWIN
   if (gc->generations_available) {
     HMODULE hm;
-    ULONG (WINAPI*rveh)(gcPVECTORED_EXCEPTION_HANDLER);
 
     hm = LoadLibrary("kernel32.dll");
-    if (hm)
+    if (hm) {
+      ULONG (WINAPI*rveh)(gcPVECTORED_EXCEPTION_HANDLER);
       rveh = (ULONG (WINAPI*)(gcPVECTORED_EXCEPTION_HANDLER))GetProcAddress(hm, "RemoveVectoredExceptionHandler");
-    else
-      rveh = NULL;
-    if (rveh)
       rveh(fault_handler);
+    }
   }
 # endif
 }