--- Array-Heap/Heap.xs	2014/10/27 22:33:50	1.7
+++ Array-Heap/Heap.xs	2015/07/14 23:28:10	1.8
@@ -49,11 +49,8 @@
   if (!cv)
     croak ("%s: callback must be a CODE reference or another callable object", SvPV_nolen (sv));
 
-  if (!PL_firstgv)  PL_firstgv  = gv_fetchpvs ("a", GV_ADD | GV_NOTQUAL, SVt_PV);
-  if (!PL_secondgv) PL_secondgv = gv_fetchpvs ("b", GV_ADD | GV_NOTQUAL, SVt_PV);
-
-  SAVESPTR (GvSV (PL_firstgv));
-  SAVESPTR (GvSV (PL_secondgv));
+  SAVESPTR (PL_firstgv ); PL_firstgv  = gv_fetchpv ("a", GV_ADD | GV_NOTQUAL, SVt_PV); SAVESPTR (GvSV (PL_firstgv ));
+  SAVESPTR (PL_secondgv); PL_secondgv = gv_fetchpv ("b", GV_ADD | GV_NOTQUAL, SVt_PV); SAVESPTR (GvSV (PL_secondgv));
 
   return cv;
 }
@@ -127,7 +124,7 @@
 {
   dCMP_CALL (cmp_data);
 
-  GvSV (PL_firstgv)  = a;
+  GvSV (PL_firstgv ) = a;
   GvSV (PL_secondgv) = b;
 
   MULTICALL;