[instancer/CFF2] Fixups

Lib/fontTools/cffLib/__init__.py

@@ -2132,9 +2132,6 @@ class FDSelectCompiler(object):
 class VarStoreCompiler(object):
     def __init__(self, varStoreData, parent):
         self.parent = parent
-        if varStoreData is None:
-            self.data = b""
-            return
         if not varStoreData.data:
             varStoreData.compile()
         data = [packCard16(len(varStoreData.data)), varStoreData.data]

Lib/fontTools/varLib/instancer/__init__.py

@@ -593,9 +593,7 @@ def instantiateCFF2(
     )  # Who knows why it's in two places?!
 
     def getNumRegions(vsindex):
-        return len(
-            varStore.VarData[vsindex if vsindex is not None else 0].VarRegionIndex
-        )
+        return varStore.VarData[vsindex if vsindex is not None else 0].VarRegionCount
 
     charStrings = topDict.CharStrings.values()
 
@@ -791,10 +789,10 @@ def instantiateCFF2(
 
     # Remove empty VarStore
     if not varStore.VarData:
-        topDict.VarStore = None
-        topDict.CharStrings.varStore = None
+        del topDict.VarStore
+        del topDict.CharStrings.varStore
         for private in privateDicts:
-            private.vstore = None
+            del private.vstore
 
 
 def _instantiateGvarGlyph(