diff --git a/Frameworks/CoreText/CTFramesetter.mm b/Frameworks/CoreText/CTFramesetter.mm
index d19932a8c9..3e0831ba5a 100644
--- a/Frameworks/CoreText/CTFramesetter.mm
+++ b/Frameworks/CoreText/CTFramesetter.mm
@@ -52,9 +52,9 @@ CTFrameRef CTFramesetterCreateFrame(CTFramesetterRef framesetter, CFRange range,
     CGRect frameRect = CGPathGetBoundingBox(path);
 
     // Call _DWriteWrapper to get _CTLine object list that makes up this frame
-    CFAttributedStringRef attributedString = __CTTypesetterGetAttributedString(framesetter->Typesetter());
+    CFAttributedStringRef attributedString = _CTTypesetterGetAttributedString(framesetter->Typesetter());
     if (range.length == 0L) {
-        range.length = CFStringGetLength(CFAttributedStringGetString(attributedString)) - range.location;
+        range.length = CFAttributedStringGetLength(attributedString) - range.location;
     }
 
     StrongId<_CTFrame> ret = _DWriteGetFrame(attributedString, range, frameRect);
@@ -127,7 +127,7 @@ CTTypesetterRef CTFramesetterGetTypesetter(CTFramesetterRef framesetter) {
 CGSize CTFramesetterSuggestFrameSizeWithConstraints(
     CTFramesetterRef framesetter, CFRange stringRange, CFDictionaryRef frameAttributes, CGSize constraints, CFRange* fitRange) {
     RETURN_RESULT_IF_NULL(framesetter, CGSizeZero);
-    return _DWriteGetFrameSize(__CTTypesetterGetAttributedString(framesetter->Typesetter()), stringRange, constraints, fitRange);
+    return _DWriteGetFrameSize(_CTTypesetterGetAttributedString(framesetter->Typesetter()), stringRange, constraints, fitRange);
 }
 
 /**
diff --git a/Frameworks/CoreText/CTTypesetter.mm b/Frameworks/CoreText/CTTypesetter.mm
index 4a05a283a1..5c69ad2f10 100644
--- a/Frameworks/CoreText/CTTypesetter.mm
+++ b/Frameworks/CoreText/CTTypesetter.mm
@@ -41,7 +41,7 @@ inline CFAttributedStringRef AttributedString() const {
     woc::StrongCF<CFAttributedStringRef> _attributedString;
 };
 
-CFAttributedStringRef __CTTypesetterGetAttributedString(CTTypesetterRef typesetter) {
+CFAttributedStringRef _CTTypesetterGetAttributedString(CTTypesetterRef typesetter) {
     RETURN_NULL_IF(!typesetter);
     return typesetter->AttributedString();
 }
@@ -73,7 +73,7 @@ CTLineRef CTTypesetterCreateLine(CTTypesetterRef typesetter, CFRange stringRange
  @Status Interoperable
 */
 CTLineRef CTTypesetterCreateLineWithOffset(CTTypesetterRef ts, CFRange range, double offset) {
-    _CTFrame* frame = _DWriteGetFrame(__CTTypesetterGetAttributedString(ts), range, CGRectMake(offset, 0, FLT_MAX, FLT_MAX));
+    _CTFrame* frame = _DWriteGetFrame(ts->AttributedString(), range, CGRectMake(offset, 0, FLT_MAX, FLT_MAX));
 
     RETURN_NULL_IF(!frame);
     if ([frame->_lines count] != 1) {
@@ -98,12 +98,10 @@ CFIndex CTTypesetterSuggestLineBreak(CTTypesetterRef typesetter, CFIndex startIn
 /**
  @Status Interoperable
 */
-CFIndex CTTypesetterSuggestLineBreakWithOffset(CTTypesetterRef ts, CFIndex index, double width, double offset) {
-    __CTTypesetter* typesetter = const_cast<__CTTypesetter*>(ts);
-    _CTFrame* frame =
-        _DWriteGetFrame(__CTTypesetterGetAttributedString(typesetter),
-                        CFRangeMake(index, CFStringGetLength(CFAttributedStringGetString(typesetter->AttributedString())) - index),
-                        CGRectMake(offset, 0, width, FLT_MAX));
+CFIndex CTTypesetterSuggestLineBreakWithOffset(CTTypesetterRef typesetter, CFIndex index, double width, double offset) {
+    _CTFrame* frame = _DWriteGetFrame(typesetter->AttributedString(),
+                                      CFRangeMake(index, CFAttributedStringGetLength(typesetter->AttributedString()) - index),
+                                      CGRectMake(offset, 0, width, FLT_MAX));
     if ([frame->_lines count] > 0) {
         return static_cast<_CTLine*>([frame->_lines firstObject])->_strRange.length;
     }
diff --git a/Frameworks/include/CoreTextInternal.h b/Frameworks/include/CoreTextInternal.h
index 765c36ad1d..dbbb4b49fc 100644
--- a/Frameworks/include/CoreTextInternal.h
+++ b/Frameworks/include/CoreTextInternal.h
@@ -45,7 +45,7 @@ inline void _SafeRelease(T** p) {
     }
 }
 
-CFAttributedStringRef __CTTypesetterGetAttributedString(CTTypesetterRef typesetter);
+CFAttributedStringRef _CTTypesetterGetAttributedString(CTTypesetterRef typesetter);
 
 @interface _CTRun : NSObject {
 @public