diff --git a/Source/SFLocator.c b/Source/SFLocator.c
index 6b448d5..9f1dd34 100644
--- a/Source/SFLocator.c
+++ b/Source/SFLocator.c
@@ -42,12 +42,10 @@ SF_INTERNAL void SFLocatorInitialize(SFLocatorRef locator, SFAlbumRef album, SFD
     locator->lookupFlag = 0;
 
     if (gdef) {
-        SFOffset offset = SFGDEF_MarkAttachClassDefOffset(gdef);
-        locator->_markAttachClassDef = SFData_Subdata(gdef, offset);
+        locator->_markAttachClassDef = SFGDEF_MarkAttachClassDefTable(gdef);
 
         if (SFGDEF_Version(gdef) == 0x00010002) {
-            offset = SFGDEF_MarkGlyphSetsDefOffset(gdef);
-            locator->_markGlyphSetsDef = SFData_Subdata(gdef, offset);
+            locator->_markGlyphSetsDef = SFGDEF_MarkGlyphSetsDefTable(gdef);
         }
     }
 }
@@ -103,10 +101,7 @@ SF_INTERNAL void SFLocatorSetMarkFilteringSet(SFLocatorRef locator, SFUInt16 mar
                 SFUInt16 markSetCount = SFMarkGlyphSets_MarkSetCount(markGlyphSetsDef);
 
                 if (markFilteringSet < markSetCount) {
-                    SFUInt32 offset = SFMarkGlyphSets_CoverageOffset(markGlyphSetsDef, markFilteringSet);
-                    SFData coverage = SFData_Subdata(markGlyphSetsDef, offset);
-
-                    locator->_markFilteringCoverage = coverage;
+                    locator->_markFilteringCoverage = SFMarkGlyphSets_CoverageTable(markGlyphSetsDef, markFilteringSet);
                 }
                 break;
             }
diff --git a/Source/SFTextProcessor.c b/Source/SFTextProcessor.c
index dec8457..5029db0 100644
--- a/Source/SFTextProcessor.c
+++ b/Source/SFTextProcessor.c
@@ -57,8 +57,7 @@ SF_INTERNAL void SFTextProcessorInitialize(SFTextProcessorRef textProcessor, SFP
 
     gdef = pattern->font->tables.gdef;
     if (gdef) {
-        SFOffset offset = SFGDEF_GlyphClassDefOffset(gdef);
-        textProcessor->_glyphClassDef = SFData_Subdata(gdef, offset);
+        textProcessor->_glyphClassDef = SFGDEF_GlyphClassDefTable(gdef);
     }
 
     SFLocatorInitialize(&textProcessor->_locator, album, gdef);