diff --git a/Mac/Modules/app/appsupport.py b/Mac/Modules/app/appsupport.py
index 880a70d..a9cdf76 100644
--- a/Mac/Modules/app/appsupport.py
+++ b/Mac/Modules/app/appsupport.py
@@ -69,8 +69,6 @@
 ThemeBackgroundKind = Type("ThemeBackgroundKind", "l")
 ThemeMetric = Type("ThemeMetric", "l")
 RGBColor = OpaqueType("RGBColor", "QdRGB")
-CFStringRef = OpaqueByValueType("CFStringRef", "CFStringRefObj")
-CFMutableStringRef = OpaqueByValueType("CFMutableStringRef", "CFMutableStringRefObj")
 TruncCode = Type("TruncCode", "h")
 
 
diff --git a/Mac/Modules/ibcarbon/IBCarbonsupport.py b/Mac/Modules/ibcarbon/IBCarbonsupport.py
index 9890c3a..a7bd3e9 100644
--- a/Mac/Modules/ibcarbon/IBCarbonsupport.py
+++ b/Mac/Modules/ibcarbon/IBCarbonsupport.py
@@ -2,7 +2,6 @@
 
 from macsupport import *
 
-CFStringRef = OpaqueByValueType('CFStringRef', 'CFStringRefObj')
 IBNibRef = OpaqueByValueType('IBNibRef', 'IBNibRefObj')
 #CFBundleRef = OpaqueByValueType('CFBundleRef')
 
diff --git a/Mac/Modules/menu/menusupport.py b/Mac/Modules/menu/menusupport.py
index b53a616..b96bc21 100644
--- a/Mac/Modules/menu/menusupport.py
+++ b/Mac/Modules/menu/menusupport.py
@@ -36,7 +36,6 @@
 unsigned_char = Type('unsigned char', 'b')
 FMFontFamily = Type("FMFontFamily", "h")
 FMFontStyle = Type("FMFontStyle", "h")
-CFStringRef = OpaqueByValueType("CFStringRef", "CFStringRefObj")
 UniChar = Type("UniChar", "h")
 
 includestuff = includestuff + """
diff --git a/Mac/Modules/mlte/_Mltemodule.c b/Mac/Modules/mlte/_Mltemodule.c
index 12ef25a..38cb4f2 100644
--- a/Mac/Modules/mlte/_Mltemodule.c
+++ b/Mac/Modules/mlte/_Mltemodule.c
@@ -1182,116 +1182,116 @@
 
 static PyMethodDef TXNObj_methods[] = {
 	{"TXNDeleteObject", (PyCFunction)TXNObj_TXNDeleteObject, 1,
-	 "() -> None"},
+	 PyDoc_STR("() -> None")},
 	{"TXNResizeFrame", (PyCFunction)TXNObj_TXNResizeFrame, 1,
-	 "(UInt32 iWidth, UInt32 iHeight, TXNFrameID iTXNFrameID) -> None"},
+	 PyDoc_STR("(UInt32 iWidth, UInt32 iHeight, TXNFrameID iTXNFrameID) -> None")},
 	{"TXNSetFrameBounds", (PyCFunction)TXNObj_TXNSetFrameBounds, 1,
-	 "(SInt32 iTop, SInt32 iLeft, SInt32 iBottom, SInt32 iRight, TXNFrameID iTXNFrameID) -> None"},
+	 PyDoc_STR("(SInt32 iTop, SInt32 iLeft, SInt32 iBottom, SInt32 iRight, TXNFrameID iTXNFrameID) -> None")},
 	{"TXNKeyDown", (PyCFunction)TXNObj_TXNKeyDown, 1,
-	 "(EventRecord iEvent) -> None"},
+	 PyDoc_STR("(EventRecord iEvent) -> None")},
 	{"TXNAdjustCursor", (PyCFunction)TXNObj_TXNAdjustCursor, 1,
-	 "(RgnHandle ioCursorRgn) -> None"},
+	 PyDoc_STR("(RgnHandle ioCursorRgn) -> None")},
 	{"TXNClick", (PyCFunction)TXNObj_TXNClick, 1,
-	 "(EventRecord iEvent) -> None"},
+	 PyDoc_STR("(EventRecord iEvent) -> None")},
 
 #if TARGET_API_MAC_OS8
 	{"TXNTSMCheck", (PyCFunction)TXNObj_TXNTSMCheck, 1,
-	 "() -> (Boolean _rv, EventRecord ioEvent)"},
+	 PyDoc_STR("() -> (Boolean _rv, EventRecord ioEvent)")},
 #endif
 	{"TXNSelectAll", (PyCFunction)TXNObj_TXNSelectAll, 1,
-	 "() -> None"},
+	 PyDoc_STR("() -> None")},
 	{"TXNFocus", (PyCFunction)TXNObj_TXNFocus, 1,
-	 "(Boolean iBecomingFocused) -> None"},
+	 PyDoc_STR("(Boolean iBecomingFocused) -> None")},
 	{"TXNUpdate", (PyCFunction)TXNObj_TXNUpdate, 1,
-	 "() -> None"},
+	 PyDoc_STR("() -> None")},
 	{"TXNDraw", (PyCFunction)TXNObj_TXNDraw, 1,
-	 "(GWorldPtr iDrawPort) -> None"},
+	 PyDoc_STR("(GWorldPtr iDrawPort) -> None")},
 	{"TXNForceUpdate", (PyCFunction)TXNObj_TXNForceUpdate, 1,
-	 "() -> None"},
+	 PyDoc_STR("() -> None")},
 	{"TXNGetSleepTicks", (PyCFunction)TXNObj_TXNGetSleepTicks, 1,
-	 "() -> (UInt32 _rv)"},
+	 PyDoc_STR("() -> (UInt32 _rv)")},
 	{"TXNIdle", (PyCFunction)TXNObj_TXNIdle, 1,
-	 "() -> None"},
+	 PyDoc_STR("() -> None")},
 	{"TXNGrowWindow", (PyCFunction)TXNObj_TXNGrowWindow, 1,
-	 "(EventRecord iEvent) -> None"},
+	 PyDoc_STR("(EventRecord iEvent) -> None")},
 	{"TXNZoomWindow", (PyCFunction)TXNObj_TXNZoomWindow, 1,
-	 "(short iPart) -> None"},
+	 PyDoc_STR("(short iPart) -> None")},
 	{"TXNCanUndo", (PyCFunction)TXNObj_TXNCanUndo, 1,
-	 "() -> (Boolean _rv, TXNActionKey oTXNActionKey)"},
+	 PyDoc_STR("() -> (Boolean _rv, TXNActionKey oTXNActionKey)")},
 	{"TXNUndo", (PyCFunction)TXNObj_TXNUndo, 1,
-	 "() -> None"},
+	 PyDoc_STR("() -> None")},
 	{"TXNCanRedo", (PyCFunction)TXNObj_TXNCanRedo, 1,
-	 "() -> (Boolean _rv, TXNActionKey oTXNActionKey)"},
+	 PyDoc_STR("() -> (Boolean _rv, TXNActionKey oTXNActionKey)")},
 	{"TXNRedo", (PyCFunction)TXNObj_TXNRedo, 1,
-	 "() -> None"},
+	 PyDoc_STR("() -> None")},
 	{"TXNCut", (PyCFunction)TXNObj_TXNCut, 1,
-	 "() -> None"},
+	 PyDoc_STR("() -> None")},
 	{"TXNCopy", (PyCFunction)TXNObj_TXNCopy, 1,
-	 "() -> None"},
+	 PyDoc_STR("() -> None")},
 	{"TXNPaste", (PyCFunction)TXNObj_TXNPaste, 1,
-	 "() -> None"},
+	 PyDoc_STR("() -> None")},
 	{"TXNClear", (PyCFunction)TXNObj_TXNClear, 1,
-	 "() -> None"},
+	 PyDoc_STR("() -> None")},
 	{"TXNGetSelection", (PyCFunction)TXNObj_TXNGetSelection, 1,
-	 "() -> (TXNOffset oStartOffset, TXNOffset oEndOffset)"},
+	 PyDoc_STR("() -> (TXNOffset oStartOffset, TXNOffset oEndOffset)")},
 	{"TXNShowSelection", (PyCFunction)TXNObj_TXNShowSelection, 1,
-	 "(Boolean iShowEnd) -> None"},
+	 PyDoc_STR("(Boolean iShowEnd) -> None")},
 	{"TXNIsSelectionEmpty", (PyCFunction)TXNObj_TXNIsSelectionEmpty, 1,
-	 "() -> (Boolean _rv)"},
+	 PyDoc_STR("() -> (Boolean _rv)")},
 	{"TXNSetSelection", (PyCFunction)TXNObj_TXNSetSelection, 1,
-	 "(TXNOffset iStartOffset, TXNOffset iEndOffset) -> None"},
+	 PyDoc_STR("(TXNOffset iStartOffset, TXNOffset iEndOffset) -> None")},
 	{"TXNCountRunsInRange", (PyCFunction)TXNObj_TXNCountRunsInRange, 1,
-	 "(TXNOffset iStartOffset, TXNOffset iEndOffset) -> (ItemCount oRunCount)"},
+	 PyDoc_STR("(TXNOffset iStartOffset, TXNOffset iEndOffset) -> (ItemCount oRunCount)")},
 	{"TXNDataSize", (PyCFunction)TXNObj_TXNDataSize, 1,
-	 "() -> (ByteCount _rv)"},
+	 PyDoc_STR("() -> (ByteCount _rv)")},
 	{"TXNGetData", (PyCFunction)TXNObj_TXNGetData, 1,
-	 "(TXNOffset iStartOffset, TXNOffset iEndOffset) -> (Handle oDataHandle)"},
+	 PyDoc_STR("(TXNOffset iStartOffset, TXNOffset iEndOffset) -> (Handle oDataHandle)")},
 	{"TXNGetDataEncoded", (PyCFunction)TXNObj_TXNGetDataEncoded, 1,
-	 "(TXNOffset iStartOffset, TXNOffset iEndOffset, TXNDataType iEncoding) -> (Handle oDataHandle)"},
+	 PyDoc_STR("(TXNOffset iStartOffset, TXNOffset iEndOffset, TXNDataType iEncoding) -> (Handle oDataHandle)")},
 	{"TXNSetDataFromFile", (PyCFunction)TXNObj_TXNSetDataFromFile, 1,
-	 "(SInt16 iFileRefNum, OSType iFileType, ByteCount iFileLength, TXNOffset iStartOffset, TXNOffset iEndOffset) -> None"},
+	 PyDoc_STR("(SInt16 iFileRefNum, OSType iFileType, ByteCount iFileLength, TXNOffset iStartOffset, TXNOffset iEndOffset) -> None")},
 	{"TXNSetData", (PyCFunction)TXNObj_TXNSetData, 1,
-	 "(TXNDataType iDataType, Buffer iDataPtr, TXNOffset iStartOffset, TXNOffset iEndOffset) -> None"},
+	 PyDoc_STR("(TXNDataType iDataType, Buffer iDataPtr, TXNOffset iStartOffset, TXNOffset iEndOffset) -> None")},
 	{"TXNGetChangeCount", (PyCFunction)TXNObj_TXNGetChangeCount, 1,
-	 "() -> (ItemCount _rv)"},
+	 PyDoc_STR("() -> (ItemCount _rv)")},
 	{"TXNSave", (PyCFunction)TXNObj_TXNSave, 1,
-	 "(TXNFileType iType, OSType iResType, TXNPermanentTextEncodingType iPermanentEncoding, FSSpec iFileSpecification, SInt16 iDataReference, SInt16 iResourceReference) -> None"},
+	 PyDoc_STR("(TXNFileType iType, OSType iResType, TXNPermanentTextEncodingType iPermanentEncoding, FSSpec iFileSpecification, SInt16 iDataReference, SInt16 iResourceReference) -> None")},
 	{"TXNRevert", (PyCFunction)TXNObj_TXNRevert, 1,
-	 "() -> None"},
+	 PyDoc_STR("() -> None")},
 	{"TXNPageSetup", (PyCFunction)TXNObj_TXNPageSetup, 1,
-	 "() -> None"},
+	 PyDoc_STR("() -> None")},
 	{"TXNPrint", (PyCFunction)TXNObj_TXNPrint, 1,
-	 "() -> None"},
+	 PyDoc_STR("() -> None")},
 	{"TXNGetViewRect", (PyCFunction)TXNObj_TXNGetViewRect, 1,
-	 "() -> (Rect oViewRect)"},
+	 PyDoc_STR("() -> (Rect oViewRect)")},
 	{"TXNSetViewRect", (PyCFunction)TXNObj_TXNSetViewRect, 1,
-	 "(Rect iViewRect) -> None"},
+	 PyDoc_STR("(Rect iViewRect) -> None")},
 	{"TXNAttachObjectToWindow", (PyCFunction)TXNObj_TXNAttachObjectToWindow, 1,
-	 "(GWorldPtr iWindow, Boolean iIsActualWindow) -> None"},
+	 PyDoc_STR("(GWorldPtr iWindow, Boolean iIsActualWindow) -> None")},
 	{"TXNIsObjectAttachedToWindow", (PyCFunction)TXNObj_TXNIsObjectAttachedToWindow, 1,
-	 "() -> (Boolean _rv)"},
+	 PyDoc_STR("() -> (Boolean _rv)")},
 	{"TXNDragTracker", (PyCFunction)TXNObj_TXNDragTracker, 1,
-	 "(TXNFrameID iTXNFrameID, DragTrackingMessage iMessage, WindowPtr iWindow, DragReference iDragReference, Boolean iDifferentObjectSameWindow) -> None"},
+	 PyDoc_STR("(TXNFrameID iTXNFrameID, DragTrackingMessage iMessage, WindowPtr iWindow, DragReference iDragReference, Boolean iDifferentObjectSameWindow) -> None")},
 	{"TXNDragReceiver", (PyCFunction)TXNObj_TXNDragReceiver, 1,
-	 "(TXNFrameID iTXNFrameID, WindowPtr iWindow, DragReference iDragReference, Boolean iDifferentObjectSameWindow) -> None"},
+	 PyDoc_STR("(TXNFrameID iTXNFrameID, WindowPtr iWindow, DragReference iDragReference, Boolean iDifferentObjectSameWindow) -> None")},
 	{"TXNActivate", (PyCFunction)TXNObj_TXNActivate, 1,
-	 "(TXNFrameID iTXNFrameID, TXNScrollBarState iActiveState) -> None"},
+	 PyDoc_STR("(TXNFrameID iTXNFrameID, TXNScrollBarState iActiveState) -> None")},
 	{"TXNEchoMode", (PyCFunction)TXNObj_TXNEchoMode, 1,
-	 "(UniChar iEchoCharacter, TextEncoding iEncoding, Boolean iOn) -> None"},
+	 PyDoc_STR("(UniChar iEchoCharacter, TextEncoding iEncoding, Boolean iOn) -> None")},
 	{"TXNDoFontMenuSelection", (PyCFunction)TXNObj_TXNDoFontMenuSelection, 1,
-	 "(TXNFontMenuObject iTXNFontMenuObject, SInt16 iMenuID, SInt16 iMenuItem) -> None"},
+	 PyDoc_STR("(TXNFontMenuObject iTXNFontMenuObject, SInt16 iMenuID, SInt16 iMenuItem) -> None")},
 	{"TXNPrepareFontMenu", (PyCFunction)TXNObj_TXNPrepareFontMenu, 1,
-	 "(TXNFontMenuObject iTXNFontMenuObject) -> None"},
+	 PyDoc_STR("(TXNFontMenuObject iTXNFontMenuObject) -> None")},
 	{"TXNPointToOffset", (PyCFunction)TXNObj_TXNPointToOffset, 1,
-	 "(Point iPoint) -> (TXNOffset oOffset)"},
+	 PyDoc_STR("(Point iPoint) -> (TXNOffset oOffset)")},
 	{"TXNOffsetToPoint", (PyCFunction)TXNObj_TXNOffsetToPoint, 1,
-	 "(TXNOffset iOffset) -> (Point oPoint)"},
+	 PyDoc_STR("(TXNOffset iOffset) -> (Point oPoint)")},
 	{"TXNGetLineCount", (PyCFunction)TXNObj_TXNGetLineCount, 1,
-	 "() -> (ItemCount oLineTotal)"},
+	 PyDoc_STR("() -> (ItemCount oLineTotal)")},
 	{"TXNGetLineMetrics", (PyCFunction)TXNObj_TXNGetLineMetrics, 1,
-	 "(UInt32 iLineNumber) -> (Fixed oLineWidth, Fixed oLineHeight)"},
+	 PyDoc_STR("(UInt32 iLineNumber) -> (Fixed oLineWidth, Fixed oLineHeight)")},
 	{"TXNIsObjectAttachedToSpecificWindow", (PyCFunction)TXNObj_TXNIsObjectAttachedToSpecificWindow, 1,
-	 "(WindowPtr iWindow) -> (Boolean oAttached)"},
+	 PyDoc_STR("(WindowPtr iWindow) -> (Boolean oAttached)")},
 	{NULL, NULL, 0}
 };
 
@@ -1405,9 +1405,9 @@
 
 static PyMethodDef TXNFontMenuObj_methods[] = {
 	{"TXNGetFontMenuHandle", (PyCFunction)TXNFontMenuObj_TXNGetFontMenuHandle, 1,
-	 "() -> (MenuHandle oFontMenuHandle)"},
+	 PyDoc_STR("() -> (MenuHandle oFontMenuHandle)")},
 	{"TXNDisposeFontMenuObject", (PyCFunction)TXNFontMenuObj_TXNDisposeFontMenuObject, 1,
-	 "() -> None"},
+	 PyDoc_STR("() -> None")},
 	{NULL, NULL, 0}
 };
 
@@ -1617,21 +1617,21 @@
 
 static PyMethodDef Mlte_methods[] = {
 	{"TXNNewObject", (PyCFunction)Mlte_TXNNewObject, 1,
-	 "(FSSpec * iFileSpec, WindowPtr iWindow, Rect * iFrame, TXNFrameOptions iFrameOptions, TXNFrameType iFrameType, TXNFileType iFileType, TXNPermanentTextEncodingType iPermanentEncoding) -> (TXNObject oTXNObject, TXNFrameID oTXNFrameID)"},
+	 PyDoc_STR("(FSSpec * iFileSpec, WindowPtr iWindow, Rect * iFrame, TXNFrameOptions iFrameOptions, TXNFrameType iFrameType, TXNFileType iFileType, TXNPermanentTextEncodingType iPermanentEncoding) -> (TXNObject oTXNObject, TXNFrameID oTXNFrameID)")},
 	{"TXNTerminateTextension", (PyCFunction)Mlte_TXNTerminateTextension, 1,
-	 "() -> None"},
+	 PyDoc_STR("() -> None")},
 	{"TXNIsScrapPastable", (PyCFunction)Mlte_TXNIsScrapPastable, 1,
-	 "() -> (Boolean _rv)"},
+	 PyDoc_STR("() -> (Boolean _rv)")},
 	{"TXNConvertToPublicScrap", (PyCFunction)Mlte_TXNConvertToPublicScrap, 1,
-	 "() -> None"},
+	 PyDoc_STR("() -> None")},
 	{"TXNConvertFromPublicScrap", (PyCFunction)Mlte_TXNConvertFromPublicScrap, 1,
-	 "() -> None"},
+	 PyDoc_STR("() -> None")},
 	{"TXNNewFontMenuObject", (PyCFunction)Mlte_TXNNewFontMenuObject, 1,
-	 "(MenuHandle iFontMenuHandle, SInt16 iMenuID, SInt16 iStartHierMenuID) -> (TXNFontMenuObject oTXNFontMenuObject)"},
+	 PyDoc_STR("(MenuHandle iFontMenuHandle, SInt16 iMenuID, SInt16 iStartHierMenuID) -> (TXNFontMenuObject oTXNFontMenuObject)")},
 	{"TXNVersionInformation", (PyCFunction)Mlte_TXNVersionInformation, 1,
-	 "() -> (TXNVersionValue _rv, TXNFeatureBits oFeatureFlags)"},
+	 PyDoc_STR("() -> (TXNVersionValue _rv, TXNFeatureBits oFeatureFlags)")},
 	{"TXNInitTextension", (PyCFunction)Mlte_TXNInitTextension, 1,
-	 "(TXNInitOptions) -> None"},
+	 PyDoc_STR("(TXNInitOptions) -> None")},
 	{NULL, NULL, 0}
 };
 
diff --git a/Mac/Modules/mlte/mltesupport.py b/Mac/Modules/mlte/mltesupport.py
index bc7c7a1..a238145 100644
--- a/Mac/Modules/mlte/mltesupport.py
+++ b/Mac/Modules/mlte/mltesupport.py
@@ -125,7 +125,6 @@
 GWorldPtr = OpaqueByValueType("GWorldPtr", "GWorldObj")
 OptGWorldPtr = OpaqueByValueType("GWorldPtr", "OptGWorldObj")
 MlteInBuffer = VarInputBufferType('void *', 'ByteCount', 'l')
-CFStringRef = OpaqueByValueType("CFStringRef", "CFStringRefObj")
 
 OptFSSpecPtr = OpaqueByValueType("FSSpec *", "OptFSSpecPtr")
 OptRectPtr = OpaqueByValueType("Rect *", "OptRectPtr")
diff --git a/Mac/Modules/win/winsupport.py b/Mac/Modules/win/winsupport.py
index 022cf94..bcd5119 100644
--- a/Mac/Modules/win/winsupport.py
+++ b/Mac/Modules/win/winsupport.py
@@ -51,7 +51,6 @@
 WindowPartCode = Type("WindowPartCode", "h")
 WindowDefPartCode = Type("WindowDefPartCode", "h")
 WindowModality = Type("WindowModality", "l")
-CFStringRef = OpaqueByValueType("CFStringRef", "CFStringRefObj")
 GDHandle = OpaqueByValueType("GDHandle", "ResObj")
 WindowConstrainOptions = Type("WindowConstrainOptions", "l")
 
diff --git a/Tools/bgen/bgen/macsupport.py b/Tools/bgen/bgen/macsupport.py
index bd38f02..049354a 100644
--- a/Tools/bgen/bgen/macsupport.py
+++ b/Tools/bgen/bgen/macsupport.py
@@ -90,6 +90,17 @@
 EventRecord = OpaqueType("EventRecord", "PyMac_BuildEventRecord", "PyMac_GetEventRecord")
 EventRecord_ptr = EventRecord
 
+# CoreFoundation datatypes
+CFTypeRef = OpaqueByValueType("CFTypeRef", "CFTypeRefObj")
+CFStringRef = OpaqueByValueType("CFStringRef", "CFStringRefObj")
+CFMutableStringRef = OpaqueByValueType("CFMutableStringRef", "CFMutableStringRefObj")
+CFArrayRef = OpaqueByValueType("CFArrayRef", "CFArrayRefObj")
+CFMutableArrayRef = OpaqueByValueType("CFMutableArrayRef", "CFMutableArrayRefObj")
+CFDictionaryRef = OpaqueByValueType("CFDictionaryRef", "CFDictionaryRefObj")
+CFMutableDictionaryRef = OpaqueByValueType("CFMutableDictionaryRef", "CFMutableDictionaryRefObj")
+CFURLRef = OpaqueByValueType("CFURLRef", "CFURLRefObj")
+OptionalCFURLRef = OpaqueByValueType("CFURLRef", "OptionalCFURLRefObj")
+
 # OSErr is special because it is turned into an exception
 # (Could do this with less code using a variant of mkvalue("O&")?)
 class OSErrType(Type):