diff --git a/GI/Vte.hs b/GI/Vte.hs
--- a/GI/Vte.hs
+++ b/GI/Vte.hs
@@ -30,9 +30,9 @@
 import GI.Vte.Objects
 import GI.Vte.Structs
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Vte/Callbacks.hs b/GI/Vte/Callbacks.hs
--- a/GI/Vte/Callbacks.hs
+++ b/GI/Vte/Callbacks.hs
@@ -23,9 +23,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -40,8 +40,8 @@
 
 type SelectionFuncC =
     Ptr Terminal ->
-    Int64 ->
-    Int64 ->
+    CLong ->
+    CLong ->
     Ptr () ->
     IO CInt
 
@@ -50,8 +50,8 @@
 
 type SelectionFunc =
     Terminal ->
-    Int64 ->
-    Int64 ->
+    CLong ->
+    CLong ->
     IO Bool
 
 noSelectionFunc :: Maybe SelectionFunc
@@ -61,8 +61,8 @@
     Maybe (Ptr (FunPtr (SelectionFuncC))) ->
     SelectionFunc ->
     Ptr Terminal ->
-    Int64 ->
-    Int64 ->
+    CLong ->
+    CLong ->
     Ptr () ->
     IO CInt
 selectionFuncWrapper funptrptr _cb terminal column row _ = do
diff --git a/GI/Vte/Constants.hs b/GI/Vte/Constants.hs
--- a/GI/Vte/Constants.hs
+++ b/GI/Vte/Constants.hs
@@ -16,9 +16,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -33,7 +33,7 @@
 pattern MINOR_VERSION = 42 :: Int32
 
 
-pattern MICRO_VERSION = 3 :: Int32
+pattern MICRO_VERSION = 5 :: Int32
 
 
 pattern MAJOR_VERSION = 0 :: Int32
diff --git a/GI/Vte/Enums.hs b/GI/Vte/Enums.hs
--- a/GI/Vte/Enums.hs
+++ b/GI/Vte/Enums.hs
@@ -21,9 +21,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Vte/Flags.hs b/GI/Vte/Flags.hs
--- a/GI/Vte/Flags.hs
+++ b/GI/Vte/Flags.hs
@@ -15,9 +15,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -57,8 +57,8 @@
 foreign import ccall "vte_pty_flags_get_type" c_vte_pty_flags_get_type :: 
     IO GType
 
-instance BoxedEnum PtyFlags where
-    boxedEnumType _ = c_vte_pty_flags_get_type
+instance BoxedFlags PtyFlags where
+    boxedFlagsType _ = c_vte_pty_flags_get_type
 
 instance IsGFlag PtyFlags
 
diff --git a/GI/Vte/Functions.hs b/GI/Vte/Functions.hs
--- a/GI/Vte/Functions.hs
+++ b/GI/Vte/Functions.hs
@@ -34,9 +34,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -47,7 +47,7 @@
 -- function vte_get_user_shell
 -- Args : []
 -- Lengths : []
--- returnType : TBasicType TFileName
+-- returnType : Just (TBasicType TFileName)
 -- throws : False
 -- Skip return : False
 
@@ -69,7 +69,7 @@
 -- function vte_get_minor_version
 -- Args : []
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : False
 -- Skip return : False
 
@@ -88,7 +88,7 @@
 -- function vte_get_micro_version
 -- Args : []
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : False
 -- Skip return : False
 
@@ -107,7 +107,7 @@
 -- function vte_get_major_version
 -- Args : []
 -- Lengths : []
--- returnType : TBasicType TUInt32
+-- returnType : Just (TBasicType TUInt)
 -- throws : False
 -- Skip return : False
 
@@ -126,7 +126,7 @@
 -- function vte_get_features
 -- Args : []
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
diff --git a/GI/Vte/Objects.hs b/GI/Vte/Objects.hs
--- a/GI/Vte/Objects.hs
+++ b/GI/Vte/Objects.hs
@@ -16,9 +16,9 @@
 import GI.Vte.Objects.Pty
 import GI.Vte.Objects.Terminal
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Vte/Objects/Pty.hs b/GI/Vte/Objects/Pty.hs
--- a/GI/Vte/Objects/Pty.hs
+++ b/GI/Vte/Objects/Pty.hs
@@ -57,21 +57,23 @@
     PtyFdPropertyInfo                       ,
     constructPtyFd                          ,
     getPtyFd                                ,
+    ptyFd                                   ,
 
 
 -- ** Flags
     PtyFlagsPropertyInfo                    ,
     constructPtyFlags                       ,
     getPtyFlags                             ,
+    ptyFlags                                ,
 
 
 
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -142,14 +144,15 @@
 #endif
 
 -- VVV Prop "fd"
-   -- Type: TBasicType TInt32
+   -- Type: TBasicType TInt
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Just False,Nothing)
 
 getPtyFd :: (MonadIO m, PtyK o) => o -> m Int32
-getPtyFd obj = liftIO $ getObjectPropertyCInt obj "fd"
+getPtyFd obj = liftIO $ getObjectPropertyInt32 obj "fd"
 
 constructPtyFd :: Int32 -> IO ([Char], GValue)
-constructPtyFd val = constructObjectPropertyCInt "fd" val
+constructPtyFd val = constructObjectPropertyInt32 "fd" val
 
 data PtyFdPropertyInfo
 instance AttrInfo PtyFdPropertyInfo where
@@ -161,10 +164,12 @@
     attrGet _ = getPtyFd
     attrSet _ = undefined
     attrConstruct _ = constructPtyFd
+    attrClear _ = undefined
 
 -- VVV Prop "flags"
    -- Type: TInterface "Vte" "PtyFlags"
    -- Flags: [PropertyReadable,PropertyWritable,PropertyConstructOnly]
+   -- Nullable: (Nothing,Nothing)
 
 getPtyFlags :: (MonadIO m, PtyK o) => o -> m [PtyFlags]
 getPtyFlags obj = liftIO $ getObjectPropertyFlags obj "flags"
@@ -182,23 +187,30 @@
     attrGet _ = getPtyFlags
     attrSet _ = undefined
     attrConstruct _ = constructPtyFlags
+    attrClear _ = undefined
 
 type instance AttributeList Pty = PtyAttributeList
 type PtyAttributeList = ('[ '("fd", PtyFdPropertyInfo), '("flags", PtyFlagsPropertyInfo)] :: [(Symbol, *)])
 
+ptyFd :: AttrLabelProxy "fd"
+ptyFd = AttrLabelProxy
+
+ptyFlags :: AttrLabelProxy "flags"
+ptyFlags = AttrLabelProxy
+
 type instance SignalList Pty = PtySignalList
 type PtySignalList = ('[ '("notify", GObject.ObjectNotifySignalInfo)] :: [(Symbol, *)])
 
 -- method Pty::new_foreign_sync
 -- method type : Constructor
--- Args : [Arg {argCName = "fd", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "fd", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Vte" "Pty"
+-- returnType : Just (TInterface "Vte" "Pty")
 -- throws : True
 -- Skip return : False
 
 foreign import ccall "vte_pty_new_foreign_sync" vte_pty_new_foreign_sync :: 
-    Int32 ->                                -- fd : TBasicType TInt32
+    Int32 ->                                -- fd : TBasicType TInt
     Ptr Gio.Cancellable ->                  -- cancellable : TInterface "Gio" "Cancellable"
     Ptr (Ptr GError) ->                     -- error
     IO (Ptr Pty)
@@ -229,7 +241,7 @@
 -- method type : Constructor
 -- Args : [Arg {argCName = "flags", argType = TInterface "Vte" "PtyFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Vte" "Pty"
+-- returnType : Just (TInterface "Vte" "Pty")
 -- throws : True
 -- Skip return : False
 
@@ -266,7 +278,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Pty", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -293,7 +305,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Pty", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : False
 -- Skip return : False
 
@@ -318,16 +330,16 @@
 
 -- method Pty::get_size
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Pty", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "rows", argType = TBasicType TInt32, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "columns", argType = TBasicType TInt32, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Pty", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "rows", argType = TBasicType TInt, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "columns", argType = TBasicType TInt, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
 foreign import ccall "vte_pty_get_size" vte_pty_get_size :: 
     Ptr Pty ->                              -- _obj : TInterface "Vte" "Pty"
-    Ptr Int32 ->                            -- rows : TBasicType TInt32
-    Ptr Int32 ->                            -- columns : TBasicType TInt32
+    Ptr Int32 ->                            -- rows : TBasicType TInt
+    Ptr Int32 ->                            -- columns : TBasicType TInt
     Ptr (Ptr GError) ->                     -- error
     IO CInt
 
@@ -359,16 +371,16 @@
 
 -- method Pty::set_size
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Pty", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "rows", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "columns", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Pty", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "rows", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "columns", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
 foreign import ccall "vte_pty_set_size" vte_pty_set_size :: 
     Ptr Pty ->                              -- _obj : TInterface "Vte" "Pty"
-    Int32 ->                                -- rows : TBasicType TInt32
-    Int32 ->                                -- columns : TBasicType TInt32
+    Int32 ->                                -- rows : TBasicType TInt
+    Int32 ->                                -- columns : TBasicType TInt
     Ptr (Ptr GError) ->                     -- error
     IO CInt
 
@@ -397,7 +409,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Pty", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "utf8", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
diff --git a/GI/Vte/Objects/Pty.hs-boot b/GI/Vte/Objects/Pty.hs-boot
--- a/GI/Vte/Objects/Pty.hs-boot
+++ b/GI/Vte/Objects/Pty.hs-boot
@@ -1,8 +1,8 @@
 module GI.Vte.Objects.Pty where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Vte/Objects/Terminal.hs b/GI/Vte/Objects/Terminal.hs
--- a/GI/Vte/Objects/Terminal.hs
+++ b/GI/Vte/Objects/Terminal.hs
@@ -439,6 +439,7 @@
     constructTerminalAllowBold              ,
     getTerminalAllowBold                    ,
     setTerminalAllowBold                    ,
+    terminalAllowBold                       ,
 
 
 -- ** AudibleBell
@@ -446,6 +447,7 @@
     constructTerminalAudibleBell            ,
     getTerminalAudibleBell                  ,
     setTerminalAudibleBell                  ,
+    terminalAudibleBell                     ,
 
 
 -- ** BackspaceBinding
@@ -453,6 +455,7 @@
     constructTerminalBackspaceBinding       ,
     getTerminalBackspaceBinding             ,
     setTerminalBackspaceBinding             ,
+    terminalBackspaceBinding                ,
 
 
 -- ** CjkAmbiguousWidth
@@ -460,16 +463,19 @@
     constructTerminalCjkAmbiguousWidth      ,
     getTerminalCjkAmbiguousWidth            ,
     setTerminalCjkAmbiguousWidth            ,
+    terminalCjkAmbiguousWidth               ,
 
 
 -- ** CurrentDirectoryUri
     TerminalCurrentDirectoryUriPropertyInfo ,
     getTerminalCurrentDirectoryUri          ,
+    terminalCurrentDirectoryUri             ,
 
 
 -- ** CurrentFileUri
     TerminalCurrentFileUriPropertyInfo      ,
     getTerminalCurrentFileUri               ,
+    terminalCurrentFileUri                  ,
 
 
 -- ** CursorBlinkMode
@@ -477,6 +483,7 @@
     constructTerminalCursorBlinkMode        ,
     getTerminalCursorBlinkMode              ,
     setTerminalCursorBlinkMode              ,
+    terminalCursorBlinkMode                 ,
 
 
 -- ** CursorShape
@@ -484,6 +491,7 @@
     constructTerminalCursorShape            ,
     getTerminalCursorShape                  ,
     setTerminalCursorShape                  ,
+    terminalCursorShape                     ,
 
 
 -- ** DeleteBinding
@@ -491,20 +499,25 @@
     constructTerminalDeleteBinding          ,
     getTerminalDeleteBinding                ,
     setTerminalDeleteBinding                ,
+    terminalDeleteBinding                   ,
 
 
 -- ** Encoding
     TerminalEncodingPropertyInfo            ,
+    clearTerminalEncoding                   ,
     constructTerminalEncoding               ,
     getTerminalEncoding                     ,
     setTerminalEncoding                     ,
+    terminalEncoding                        ,
 
 
 -- ** FontDesc
     TerminalFontDescPropertyInfo            ,
+    clearTerminalFontDesc                   ,
     constructTerminalFontDesc               ,
     getTerminalFontDesc                     ,
     setTerminalFontDesc                     ,
+    terminalFontDesc                        ,
 
 
 -- ** FontScale
@@ -512,11 +525,13 @@
     constructTerminalFontScale              ,
     getTerminalFontScale                    ,
     setTerminalFontScale                    ,
+    terminalFontScale                       ,
 
 
 -- ** IconTitle
     TerminalIconTitlePropertyInfo           ,
     getTerminalIconTitle                    ,
+    terminalIconTitle                       ,
 
 
 -- ** InputEnabled
@@ -524,6 +539,7 @@
     constructTerminalInputEnabled           ,
     getTerminalInputEnabled                 ,
     setTerminalInputEnabled                 ,
+    terminalInputEnabled                    ,
 
 
 -- ** PointerAutohide
@@ -531,13 +547,16 @@
     constructTerminalPointerAutohide        ,
     getTerminalPointerAutohide              ,
     setTerminalPointerAutohide              ,
+    terminalPointerAutohide                 ,
 
 
 -- ** Pty
     TerminalPtyPropertyInfo                 ,
+    clearTerminalPty                        ,
     constructTerminalPty                    ,
     getTerminalPty                          ,
     setTerminalPty                          ,
+    terminalPty                             ,
 
 
 -- ** RewrapOnResize
@@ -545,6 +564,7 @@
     constructTerminalRewrapOnResize         ,
     getTerminalRewrapOnResize               ,
     setTerminalRewrapOnResize               ,
+    terminalRewrapOnResize                  ,
 
 
 -- ** ScrollOnKeystroke
@@ -552,6 +572,7 @@
     constructTerminalScrollOnKeystroke      ,
     getTerminalScrollOnKeystroke            ,
     setTerminalScrollOnKeystroke            ,
+    terminalScrollOnKeystroke               ,
 
 
 -- ** ScrollOnOutput
@@ -559,6 +580,7 @@
     constructTerminalScrollOnOutput         ,
     getTerminalScrollOnOutput               ,
     setTerminalScrollOnOutput               ,
+    terminalScrollOnOutput                  ,
 
 
 -- ** ScrollbackLines
@@ -566,16 +588,19 @@
     constructTerminalScrollbackLines        ,
     getTerminalScrollbackLines              ,
     setTerminalScrollbackLines              ,
+    terminalScrollbackLines                 ,
 
 
 -- ** WindowTitle
     TerminalWindowTitlePropertyInfo         ,
     getTerminalWindowTitle                  ,
+    terminalWindowTitle                     ,
 
 
 -- ** WordCharExceptions
     TerminalWordCharExceptionsPropertyInfo  ,
     getTerminalWordCharExceptions           ,
+    terminalWordCharExceptions              ,
 
 
 
@@ -957,9 +982,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -2607,6 +2632,7 @@
 -- VVV Prop "allow-bold"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getTerminalAllowBold :: (MonadIO m, TerminalK o) => o -> m Bool
 getTerminalAllowBold obj = liftIO $ getObjectPropertyBool obj "allow-bold"
@@ -2627,10 +2653,12 @@
     attrGet _ = getTerminalAllowBold
     attrSet _ = setTerminalAllowBold
     attrConstruct _ = constructTerminalAllowBold
+    attrClear _ = undefined
 
 -- VVV Prop "audible-bell"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getTerminalAudibleBell :: (MonadIO m, TerminalK o) => o -> m Bool
 getTerminalAudibleBell obj = liftIO $ getObjectPropertyBool obj "audible-bell"
@@ -2651,10 +2679,12 @@
     attrGet _ = getTerminalAudibleBell
     attrSet _ = setTerminalAudibleBell
     attrConstruct _ = constructTerminalAudibleBell
+    attrClear _ = undefined
 
 -- VVV Prop "backspace-binding"
    -- Type: TInterface "Vte" "EraseBinding"
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Nothing,Just False)
 
 getTerminalBackspaceBinding :: (MonadIO m, TerminalK o) => o -> m EraseBinding
 getTerminalBackspaceBinding obj = liftIO $ getObjectPropertyEnum obj "backspace-binding"
@@ -2675,19 +2705,21 @@
     attrGet _ = getTerminalBackspaceBinding
     attrSet _ = setTerminalBackspaceBinding
     attrConstruct _ = constructTerminalBackspaceBinding
+    attrClear _ = undefined
 
 -- VVV Prop "cjk-ambiguous-width"
-   -- Type: TBasicType TInt32
+   -- Type: TBasicType TInt
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getTerminalCjkAmbiguousWidth :: (MonadIO m, TerminalK o) => o -> m Int32
-getTerminalCjkAmbiguousWidth obj = liftIO $ getObjectPropertyCInt obj "cjk-ambiguous-width"
+getTerminalCjkAmbiguousWidth obj = liftIO $ getObjectPropertyInt32 obj "cjk-ambiguous-width"
 
 setTerminalCjkAmbiguousWidth :: (MonadIO m, TerminalK o) => o -> Int32 -> m ()
-setTerminalCjkAmbiguousWidth obj val = liftIO $ setObjectPropertyCInt obj "cjk-ambiguous-width" val
+setTerminalCjkAmbiguousWidth obj val = liftIO $ setObjectPropertyInt32 obj "cjk-ambiguous-width" val
 
 constructTerminalCjkAmbiguousWidth :: Int32 -> IO ([Char], GValue)
-constructTerminalCjkAmbiguousWidth val = constructObjectPropertyCInt "cjk-ambiguous-width" val
+constructTerminalCjkAmbiguousWidth val = constructObjectPropertyInt32 "cjk-ambiguous-width" val
 
 data TerminalCjkAmbiguousWidthPropertyInfo
 instance AttrInfo TerminalCjkAmbiguousWidthPropertyInfo where
@@ -2699,17 +2731,19 @@
     attrGet _ = getTerminalCjkAmbiguousWidth
     attrSet _ = setTerminalCjkAmbiguousWidth
     attrConstruct _ = constructTerminalCjkAmbiguousWidth
+    attrClear _ = undefined
 
 -- VVV Prop "current-directory-uri"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getTerminalCurrentDirectoryUri :: (MonadIO m, TerminalK o) => o -> m T.Text
-getTerminalCurrentDirectoryUri obj = liftIO $ getObjectPropertyString obj "current-directory-uri"
+getTerminalCurrentDirectoryUri obj = liftIO $ checkUnexpectedNothing "getTerminalCurrentDirectoryUri" $ getObjectPropertyString obj "current-directory-uri"
 
 data TerminalCurrentDirectoryUriPropertyInfo
 instance AttrInfo TerminalCurrentDirectoryUriPropertyInfo where
-    type AttrAllowedOps TerminalCurrentDirectoryUriPropertyInfo = '[ 'AttrGet]
+    type AttrAllowedOps TerminalCurrentDirectoryUriPropertyInfo = '[ 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint TerminalCurrentDirectoryUriPropertyInfo = (~) ()
     type AttrBaseTypeConstraint TerminalCurrentDirectoryUriPropertyInfo = TerminalK
     type AttrGetType TerminalCurrentDirectoryUriPropertyInfo = T.Text
@@ -2717,17 +2751,19 @@
     attrGet _ = getTerminalCurrentDirectoryUri
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "current-file-uri"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getTerminalCurrentFileUri :: (MonadIO m, TerminalK o) => o -> m T.Text
-getTerminalCurrentFileUri obj = liftIO $ getObjectPropertyString obj "current-file-uri"
+getTerminalCurrentFileUri obj = liftIO $ checkUnexpectedNothing "getTerminalCurrentFileUri" $ getObjectPropertyString obj "current-file-uri"
 
 data TerminalCurrentFileUriPropertyInfo
 instance AttrInfo TerminalCurrentFileUriPropertyInfo where
-    type AttrAllowedOps TerminalCurrentFileUriPropertyInfo = '[ 'AttrGet]
+    type AttrAllowedOps TerminalCurrentFileUriPropertyInfo = '[ 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint TerminalCurrentFileUriPropertyInfo = (~) ()
     type AttrBaseTypeConstraint TerminalCurrentFileUriPropertyInfo = TerminalK
     type AttrGetType TerminalCurrentFileUriPropertyInfo = T.Text
@@ -2735,10 +2771,12 @@
     attrGet _ = getTerminalCurrentFileUri
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "cursor-blink-mode"
    -- Type: TInterface "Vte" "CursorBlinkMode"
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getTerminalCursorBlinkMode :: (MonadIO m, TerminalK o) => o -> m CursorBlinkMode
 getTerminalCursorBlinkMode obj = liftIO $ getObjectPropertyEnum obj "cursor-blink-mode"
@@ -2759,10 +2797,12 @@
     attrGet _ = getTerminalCursorBlinkMode
     attrSet _ = setTerminalCursorBlinkMode
     attrConstruct _ = constructTerminalCursorBlinkMode
+    attrClear _ = undefined
 
 -- VVV Prop "cursor-shape"
    -- Type: TInterface "Vte" "CursorShape"
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getTerminalCursorShape :: (MonadIO m, TerminalK o) => o -> m CursorShape
 getTerminalCursorShape obj = liftIO $ getObjectPropertyEnum obj "cursor-shape"
@@ -2783,10 +2823,12 @@
     attrGet _ = getTerminalCursorShape
     attrSet _ = setTerminalCursorShape
     attrConstruct _ = constructTerminalCursorShape
+    attrClear _ = undefined
 
 -- VVV Prop "delete-binding"
    -- Type: TInterface "Vte" "EraseBinding"
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Nothing,Just False)
 
 getTerminalDeleteBinding :: (MonadIO m, TerminalK o) => o -> m EraseBinding
 getTerminalDeleteBinding obj = liftIO $ getObjectPropertyEnum obj "delete-binding"
@@ -2807,23 +2849,28 @@
     attrGet _ = getTerminalDeleteBinding
     attrSet _ = setTerminalDeleteBinding
     attrConstruct _ = constructTerminalDeleteBinding
+    attrClear _ = undefined
 
 -- VVV Prop "encoding"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Nothing)
 
 getTerminalEncoding :: (MonadIO m, TerminalK o) => o -> m T.Text
-getTerminalEncoding obj = liftIO $ getObjectPropertyString obj "encoding"
+getTerminalEncoding obj = liftIO $ checkUnexpectedNothing "getTerminalEncoding" $ getObjectPropertyString obj "encoding"
 
 setTerminalEncoding :: (MonadIO m, TerminalK o) => o -> T.Text -> m ()
-setTerminalEncoding obj val = liftIO $ setObjectPropertyString obj "encoding" val
+setTerminalEncoding obj val = liftIO $ setObjectPropertyString obj "encoding" (Just val)
 
 constructTerminalEncoding :: T.Text -> IO ([Char], GValue)
-constructTerminalEncoding val = constructObjectPropertyString "encoding" val
+constructTerminalEncoding val = constructObjectPropertyString "encoding" (Just val)
 
+clearTerminalEncoding :: (MonadIO m, TerminalK o) => o -> m ()
+clearTerminalEncoding obj = liftIO $ setObjectPropertyString obj "encoding" (Nothing :: Maybe T.Text)
+
 data TerminalEncodingPropertyInfo
 instance AttrInfo TerminalEncodingPropertyInfo where
-    type AttrAllowedOps TerminalEncodingPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps TerminalEncodingPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint TerminalEncodingPropertyInfo = (~) T.Text
     type AttrBaseTypeConstraint TerminalEncodingPropertyInfo = TerminalK
     type AttrGetType TerminalEncodingPropertyInfo = T.Text
@@ -2831,34 +2878,41 @@
     attrGet _ = getTerminalEncoding
     attrSet _ = setTerminalEncoding
     attrConstruct _ = constructTerminalEncoding
+    attrClear _ = clearTerminalEncoding
 
 -- VVV Prop "font-desc"
    -- Type: TInterface "Pango" "FontDescription"
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Nothing,Nothing)
 
-getTerminalFontDesc :: (MonadIO m, TerminalK o) => o -> m Pango.FontDescription
+getTerminalFontDesc :: (MonadIO m, TerminalK o) => o -> m (Maybe Pango.FontDescription)
 getTerminalFontDesc obj = liftIO $ getObjectPropertyBoxed obj "font-desc" Pango.FontDescription
 
 setTerminalFontDesc :: (MonadIO m, TerminalK o) => o -> Pango.FontDescription -> m ()
-setTerminalFontDesc obj val = liftIO $ setObjectPropertyBoxed obj "font-desc" val
+setTerminalFontDesc obj val = liftIO $ setObjectPropertyBoxed obj "font-desc" (Just val)
 
 constructTerminalFontDesc :: Pango.FontDescription -> IO ([Char], GValue)
-constructTerminalFontDesc val = constructObjectPropertyBoxed "font-desc" val
+constructTerminalFontDesc val = constructObjectPropertyBoxed "font-desc" (Just val)
 
+clearTerminalFontDesc :: (MonadIO m, TerminalK o) => o -> m ()
+clearTerminalFontDesc obj = liftIO $ setObjectPropertyBoxed obj "font-desc" (Nothing :: Maybe Pango.FontDescription)
+
 data TerminalFontDescPropertyInfo
 instance AttrInfo TerminalFontDescPropertyInfo where
-    type AttrAllowedOps TerminalFontDescPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps TerminalFontDescPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint TerminalFontDescPropertyInfo = (~) Pango.FontDescription
     type AttrBaseTypeConstraint TerminalFontDescPropertyInfo = TerminalK
-    type AttrGetType TerminalFontDescPropertyInfo = Pango.FontDescription
+    type AttrGetType TerminalFontDescPropertyInfo = (Maybe Pango.FontDescription)
     type AttrLabel TerminalFontDescPropertyInfo = "font-desc"
     attrGet _ = getTerminalFontDesc
     attrSet _ = setTerminalFontDesc
     attrConstruct _ = constructTerminalFontDesc
+    attrClear _ = clearTerminalFontDesc
 
 -- VVV Prop "font-scale"
    -- Type: TBasicType TDouble
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getTerminalFontScale :: (MonadIO m, TerminalK o) => o -> m Double
 getTerminalFontScale obj = liftIO $ getObjectPropertyDouble obj "font-scale"
@@ -2879,17 +2933,19 @@
     attrGet _ = getTerminalFontScale
     attrSet _ = setTerminalFontScale
     attrConstruct _ = constructTerminalFontScale
+    attrClear _ = undefined
 
 -- VVV Prop "icon-title"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getTerminalIconTitle :: (MonadIO m, TerminalK o) => o -> m T.Text
-getTerminalIconTitle obj = liftIO $ getObjectPropertyString obj "icon-title"
+getTerminalIconTitle obj = liftIO $ checkUnexpectedNothing "getTerminalIconTitle" $ getObjectPropertyString obj "icon-title"
 
 data TerminalIconTitlePropertyInfo
 instance AttrInfo TerminalIconTitlePropertyInfo where
-    type AttrAllowedOps TerminalIconTitlePropertyInfo = '[ 'AttrGet]
+    type AttrAllowedOps TerminalIconTitlePropertyInfo = '[ 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint TerminalIconTitlePropertyInfo = (~) ()
     type AttrBaseTypeConstraint TerminalIconTitlePropertyInfo = TerminalK
     type AttrGetType TerminalIconTitlePropertyInfo = T.Text
@@ -2897,10 +2953,12 @@
     attrGet _ = getTerminalIconTitle
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "input-enabled"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getTerminalInputEnabled :: (MonadIO m, TerminalK o) => o -> m Bool
 getTerminalInputEnabled obj = liftIO $ getObjectPropertyBool obj "input-enabled"
@@ -2921,10 +2979,12 @@
     attrGet _ = getTerminalInputEnabled
     attrSet _ = setTerminalInputEnabled
     attrConstruct _ = constructTerminalInputEnabled
+    attrClear _ = undefined
 
 -- VVV Prop "pointer-autohide"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Nothing,Nothing)
 
 getTerminalPointerAutohide :: (MonadIO m, TerminalK o) => o -> m Bool
 getTerminalPointerAutohide obj = liftIO $ getObjectPropertyBool obj "pointer-autohide"
@@ -2945,23 +3005,28 @@
     attrGet _ = getTerminalPointerAutohide
     attrSet _ = setTerminalPointerAutohide
     attrConstruct _ = constructTerminalPointerAutohide
+    attrClear _ = undefined
 
 -- VVV Prop "pty"
    -- Type: TInterface "Vte" "Pty"
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just True)
 
 getTerminalPty :: (MonadIO m, TerminalK o) => o -> m Pty
-getTerminalPty obj = liftIO $ getObjectPropertyObject obj "pty" Pty
+getTerminalPty obj = liftIO $ checkUnexpectedNothing "getTerminalPty" $ getObjectPropertyObject obj "pty" Pty
 
 setTerminalPty :: (MonadIO m, TerminalK o, PtyK a) => o -> a -> m ()
-setTerminalPty obj val = liftIO $ setObjectPropertyObject obj "pty" val
+setTerminalPty obj val = liftIO $ setObjectPropertyObject obj "pty" (Just val)
 
 constructTerminalPty :: (PtyK a) => a -> IO ([Char], GValue)
-constructTerminalPty val = constructObjectPropertyObject "pty" val
+constructTerminalPty val = constructObjectPropertyObject "pty" (Just val)
 
+clearTerminalPty :: (MonadIO m, TerminalK o) => o -> m ()
+clearTerminalPty obj = liftIO $ setObjectPropertyObject obj "pty" (Nothing :: Maybe Pty)
+
 data TerminalPtyPropertyInfo
 instance AttrInfo TerminalPtyPropertyInfo where
-    type AttrAllowedOps TerminalPtyPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet]
+    type AttrAllowedOps TerminalPtyPropertyInfo = '[ 'AttrSet, 'AttrConstruct, 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint TerminalPtyPropertyInfo = PtyK
     type AttrBaseTypeConstraint TerminalPtyPropertyInfo = TerminalK
     type AttrGetType TerminalPtyPropertyInfo = Pty
@@ -2969,10 +3034,12 @@
     attrGet _ = getTerminalPty
     attrSet _ = setTerminalPty
     attrConstruct _ = constructTerminalPty
+    attrClear _ = clearTerminalPty
 
 -- VVV Prop "rewrap-on-resize"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Just False,Just False)
 
 getTerminalRewrapOnResize :: (MonadIO m, TerminalK o) => o -> m Bool
 getTerminalRewrapOnResize obj = liftIO $ getObjectPropertyBool obj "rewrap-on-resize"
@@ -2993,10 +3060,12 @@
     attrGet _ = getTerminalRewrapOnResize
     attrSet _ = setTerminalRewrapOnResize
     attrConstruct _ = constructTerminalRewrapOnResize
+    attrClear _ = undefined
 
 -- VVV Prop "scroll-on-keystroke"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Nothing,Just False)
 
 getTerminalScrollOnKeystroke :: (MonadIO m, TerminalK o) => o -> m Bool
 getTerminalScrollOnKeystroke obj = liftIO $ getObjectPropertyBool obj "scroll-on-keystroke"
@@ -3017,10 +3086,12 @@
     attrGet _ = getTerminalScrollOnKeystroke
     attrSet _ = setTerminalScrollOnKeystroke
     attrConstruct _ = constructTerminalScrollOnKeystroke
+    attrClear _ = undefined
 
 -- VVV Prop "scroll-on-output"
    -- Type: TBasicType TBoolean
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Nothing,Just False)
 
 getTerminalScrollOnOutput :: (MonadIO m, TerminalK o) => o -> m Bool
 getTerminalScrollOnOutput obj = liftIO $ getObjectPropertyBool obj "scroll-on-output"
@@ -3041,19 +3112,21 @@
     attrGet _ = getTerminalScrollOnOutput
     attrSet _ = setTerminalScrollOnOutput
     attrConstruct _ = constructTerminalScrollOnOutput
+    attrClear _ = undefined
 
 -- VVV Prop "scrollback-lines"
-   -- Type: TBasicType TUInt32
+   -- Type: TBasicType TUInt
    -- Flags: [PropertyReadable,PropertyWritable]
+   -- Nullable: (Nothing,Nothing)
 
 getTerminalScrollbackLines :: (MonadIO m, TerminalK o) => o -> m Word32
-getTerminalScrollbackLines obj = liftIO $ getObjectPropertyCUInt obj "scrollback-lines"
+getTerminalScrollbackLines obj = liftIO $ getObjectPropertyUInt32 obj "scrollback-lines"
 
 setTerminalScrollbackLines :: (MonadIO m, TerminalK o) => o -> Word32 -> m ()
-setTerminalScrollbackLines obj val = liftIO $ setObjectPropertyCUInt obj "scrollback-lines" val
+setTerminalScrollbackLines obj val = liftIO $ setObjectPropertyUInt32 obj "scrollback-lines" val
 
 constructTerminalScrollbackLines :: Word32 -> IO ([Char], GValue)
-constructTerminalScrollbackLines val = constructObjectPropertyCUInt "scrollback-lines" val
+constructTerminalScrollbackLines val = constructObjectPropertyUInt32 "scrollback-lines" val
 
 data TerminalScrollbackLinesPropertyInfo
 instance AttrInfo TerminalScrollbackLinesPropertyInfo where
@@ -3065,17 +3138,19 @@
     attrGet _ = getTerminalScrollbackLines
     attrSet _ = setTerminalScrollbackLines
     attrConstruct _ = constructTerminalScrollbackLines
+    attrClear _ = undefined
 
 -- VVV Prop "window-title"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Nothing)
 
 getTerminalWindowTitle :: (MonadIO m, TerminalK o) => o -> m T.Text
-getTerminalWindowTitle obj = liftIO $ getObjectPropertyString obj "window-title"
+getTerminalWindowTitle obj = liftIO $ checkUnexpectedNothing "getTerminalWindowTitle" $ getObjectPropertyString obj "window-title"
 
 data TerminalWindowTitlePropertyInfo
 instance AttrInfo TerminalWindowTitlePropertyInfo where
-    type AttrAllowedOps TerminalWindowTitlePropertyInfo = '[ 'AttrGet]
+    type AttrAllowedOps TerminalWindowTitlePropertyInfo = '[ 'AttrGet, 'AttrClear]
     type AttrSetTypeConstraint TerminalWindowTitlePropertyInfo = (~) ()
     type AttrBaseTypeConstraint TerminalWindowTitlePropertyInfo = TerminalK
     type AttrGetType TerminalWindowTitlePropertyInfo = T.Text
@@ -3083,13 +3158,15 @@
     attrGet _ = getTerminalWindowTitle
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 -- VVV Prop "word-char-exceptions"
    -- Type: TBasicType TUTF8
    -- Flags: [PropertyReadable]
+   -- Nullable: (Just False,Just False)
 
 getTerminalWordCharExceptions :: (MonadIO m, TerminalK o) => o -> m T.Text
-getTerminalWordCharExceptions obj = liftIO $ getObjectPropertyString obj "word-char-exceptions"
+getTerminalWordCharExceptions obj = liftIO $ checkUnexpectedNothing "getTerminalWordCharExceptions" $ getObjectPropertyString obj "word-char-exceptions"
 
 data TerminalWordCharExceptionsPropertyInfo
 instance AttrInfo TerminalWordCharExceptionsPropertyInfo where
@@ -3101,10 +3178,77 @@
     attrGet _ = getTerminalWordCharExceptions
     attrSet _ = undefined
     attrConstruct _ = undefined
+    attrClear _ = undefined
 
 type instance AttributeList Terminal = TerminalAttributeList
 type TerminalAttributeList = ('[ '("allowBold", TerminalAllowBoldPropertyInfo), '("appPaintable", Gtk.WidgetAppPaintablePropertyInfo), '("audibleBell", TerminalAudibleBellPropertyInfo), '("backspaceBinding", TerminalBackspaceBindingPropertyInfo), '("canDefault", Gtk.WidgetCanDefaultPropertyInfo), '("canFocus", Gtk.WidgetCanFocusPropertyInfo), '("cjkAmbiguousWidth", TerminalCjkAmbiguousWidthPropertyInfo), '("compositeChild", Gtk.WidgetCompositeChildPropertyInfo), '("currentDirectoryUri", TerminalCurrentDirectoryUriPropertyInfo), '("currentFileUri", TerminalCurrentFileUriPropertyInfo), '("cursorBlinkMode", TerminalCursorBlinkModePropertyInfo), '("cursorShape", TerminalCursorShapePropertyInfo), '("deleteBinding", TerminalDeleteBindingPropertyInfo), '("doubleBuffered", Gtk.WidgetDoubleBufferedPropertyInfo), '("encoding", TerminalEncodingPropertyInfo), '("events", Gtk.WidgetEventsPropertyInfo), '("expand", Gtk.WidgetExpandPropertyInfo), '("fontDesc", TerminalFontDescPropertyInfo), '("fontScale", TerminalFontScalePropertyInfo), '("hadjustment", Gtk.ScrollableHadjustmentPropertyInfo), '("halign", Gtk.WidgetHalignPropertyInfo), '("hasDefault", Gtk.WidgetHasDefaultPropertyInfo), '("hasFocus", Gtk.WidgetHasFocusPropertyInfo), '("hasTooltip", Gtk.WidgetHasTooltipPropertyInfo), '("heightRequest", Gtk.WidgetHeightRequestPropertyInfo), '("hexpand", Gtk.WidgetHexpandPropertyInfo), '("hexpandSet", Gtk.WidgetHexpandSetPropertyInfo), '("hscrollPolicy", Gtk.ScrollableHscrollPolicyPropertyInfo), '("iconTitle", TerminalIconTitlePropertyInfo), '("inputEnabled", TerminalInputEnabledPropertyInfo), '("isFocus", Gtk.WidgetIsFocusPropertyInfo), '("margin", Gtk.WidgetMarginPropertyInfo), '("marginBottom", Gtk.WidgetMarginBottomPropertyInfo), '("marginEnd", Gtk.WidgetMarginEndPropertyInfo), '("marginLeft", Gtk.WidgetMarginLeftPropertyInfo), '("marginRight", Gtk.WidgetMarginRightPropertyInfo), '("marginStart", Gtk.WidgetMarginStartPropertyInfo), '("marginTop", Gtk.WidgetMarginTopPropertyInfo), '("name", Gtk.WidgetNamePropertyInfo), '("noShowAll", Gtk.WidgetNoShowAllPropertyInfo), '("opacity", Gtk.WidgetOpacityPropertyInfo), '("parent", Gtk.WidgetParentPropertyInfo), '("pointerAutohide", TerminalPointerAutohidePropertyInfo), '("pty", TerminalPtyPropertyInfo), '("receivesDefault", Gtk.WidgetReceivesDefaultPropertyInfo), '("rewrapOnResize", TerminalRewrapOnResizePropertyInfo), '("scaleFactor", Gtk.WidgetScaleFactorPropertyInfo), '("scrollOnKeystroke", TerminalScrollOnKeystrokePropertyInfo), '("scrollOnOutput", TerminalScrollOnOutputPropertyInfo), '("scrollbackLines", TerminalScrollbackLinesPropertyInfo), '("sensitive", Gtk.WidgetSensitivePropertyInfo), '("style", Gtk.WidgetStylePropertyInfo), '("tooltipMarkup", Gtk.WidgetTooltipMarkupPropertyInfo), '("tooltipText", Gtk.WidgetTooltipTextPropertyInfo), '("vadjustment", Gtk.ScrollableVadjustmentPropertyInfo), '("valign", Gtk.WidgetValignPropertyInfo), '("vexpand", Gtk.WidgetVexpandPropertyInfo), '("vexpandSet", Gtk.WidgetVexpandSetPropertyInfo), '("visible", Gtk.WidgetVisiblePropertyInfo), '("vscrollPolicy", Gtk.ScrollableVscrollPolicyPropertyInfo), '("widthRequest", Gtk.WidgetWidthRequestPropertyInfo), '("window", Gtk.WidgetWindowPropertyInfo), '("windowTitle", TerminalWindowTitlePropertyInfo), '("wordCharExceptions", TerminalWordCharExceptionsPropertyInfo)] :: [(Symbol, *)])
 
+terminalAllowBold :: AttrLabelProxy "allowBold"
+terminalAllowBold = AttrLabelProxy
+
+terminalAudibleBell :: AttrLabelProxy "audibleBell"
+terminalAudibleBell = AttrLabelProxy
+
+terminalBackspaceBinding :: AttrLabelProxy "backspaceBinding"
+terminalBackspaceBinding = AttrLabelProxy
+
+terminalCjkAmbiguousWidth :: AttrLabelProxy "cjkAmbiguousWidth"
+terminalCjkAmbiguousWidth = AttrLabelProxy
+
+terminalCurrentDirectoryUri :: AttrLabelProxy "currentDirectoryUri"
+terminalCurrentDirectoryUri = AttrLabelProxy
+
+terminalCurrentFileUri :: AttrLabelProxy "currentFileUri"
+terminalCurrentFileUri = AttrLabelProxy
+
+terminalCursorBlinkMode :: AttrLabelProxy "cursorBlinkMode"
+terminalCursorBlinkMode = AttrLabelProxy
+
+terminalCursorShape :: AttrLabelProxy "cursorShape"
+terminalCursorShape = AttrLabelProxy
+
+terminalDeleteBinding :: AttrLabelProxy "deleteBinding"
+terminalDeleteBinding = AttrLabelProxy
+
+terminalEncoding :: AttrLabelProxy "encoding"
+terminalEncoding = AttrLabelProxy
+
+terminalFontDesc :: AttrLabelProxy "fontDesc"
+terminalFontDesc = AttrLabelProxy
+
+terminalFontScale :: AttrLabelProxy "fontScale"
+terminalFontScale = AttrLabelProxy
+
+terminalIconTitle :: AttrLabelProxy "iconTitle"
+terminalIconTitle = AttrLabelProxy
+
+terminalInputEnabled :: AttrLabelProxy "inputEnabled"
+terminalInputEnabled = AttrLabelProxy
+
+terminalPointerAutohide :: AttrLabelProxy "pointerAutohide"
+terminalPointerAutohide = AttrLabelProxy
+
+terminalPty :: AttrLabelProxy "pty"
+terminalPty = AttrLabelProxy
+
+terminalRewrapOnResize :: AttrLabelProxy "rewrapOnResize"
+terminalRewrapOnResize = AttrLabelProxy
+
+terminalScrollOnKeystroke :: AttrLabelProxy "scrollOnKeystroke"
+terminalScrollOnKeystroke = AttrLabelProxy
+
+terminalScrollOnOutput :: AttrLabelProxy "scrollOnOutput"
+terminalScrollOnOutput = AttrLabelProxy
+
+terminalScrollbackLines :: AttrLabelProxy "scrollbackLines"
+terminalScrollbackLines = AttrLabelProxy
+
+terminalWindowTitle :: AttrLabelProxy "windowTitle"
+terminalWindowTitle = AttrLabelProxy
+
+terminalWordCharExceptions :: AttrLabelProxy "wordCharExceptions"
+terminalWordCharExceptions = AttrLabelProxy
+
 data TerminalBellSignalInfo
 instance SignalInfo TerminalBellSignalInfo where
     type HaskellCallbackType TerminalBellSignalInfo = TerminalBellCallback
@@ -3267,7 +3411,7 @@
 -- method type : Constructor
 -- Args : []
 -- Lengths : []
--- returnType : TInterface "Vte" "Terminal"
+-- returnType : Just (TInterface "Vte" "Terminal")
 -- throws : False
 -- Skip return : False
 
@@ -3288,7 +3432,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -3315,7 +3459,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -3342,7 +3486,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "data", argType = TCArray False (-1) 2 (TBasicType TUInt8), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "length", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "length", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -3375,7 +3519,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "text", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "length", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -3408,7 +3552,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "data", argType = TBasicType TUInt8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "length", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -3439,7 +3583,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -3467,7 +3611,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -3495,19 +3639,19 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TLong)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "vte_terminal_get_char_height" vte_terminal_get_char_height :: 
     Ptr Terminal ->                         -- _obj : TInterface "Vte" "Terminal"
-    IO Int64
+    IO CLong
 
 
 terminalGetCharHeight ::
     (MonadIO m, TerminalK a) =>
     a                                       -- _obj
-    -> m Int64                              -- result
+    -> m CLong                              -- result
 terminalGetCharHeight _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- vte_terminal_get_char_height _obj'
@@ -3515,26 +3659,26 @@
     return result
 
 data TerminalGetCharHeightMethodInfo
-instance (signature ~ (m Int64), MonadIO m, TerminalK a) => MethodInfo TerminalGetCharHeightMethodInfo a signature where
+instance (signature ~ (m CLong), MonadIO m, TerminalK a) => MethodInfo TerminalGetCharHeightMethodInfo a signature where
     overloadedMethod _ = terminalGetCharHeight
 
 -- method Terminal::get_char_width
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TLong)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "vte_terminal_get_char_width" vte_terminal_get_char_width :: 
     Ptr Terminal ->                         -- _obj : TInterface "Vte" "Terminal"
-    IO Int64
+    IO CLong
 
 
 terminalGetCharWidth ::
     (MonadIO m, TerminalK a) =>
     a                                       -- _obj
-    -> m Int64                              -- result
+    -> m CLong                              -- result
 terminalGetCharWidth _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- vte_terminal_get_char_width _obj'
@@ -3542,14 +3686,14 @@
     return result
 
 data TerminalGetCharWidthMethodInfo
-instance (signature ~ (m Int64), MonadIO m, TerminalK a) => MethodInfo TerminalGetCharWidthMethodInfo a signature where
+instance (signature ~ (m CLong), MonadIO m, TerminalK a) => MethodInfo TerminalGetCharWidthMethodInfo a signature where
     overloadedMethod _ = terminalGetCharWidth
 
 -- method Terminal::get_cjk_ambiguous_width
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : False
 -- Skip return : False
 
@@ -3576,19 +3720,19 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TLong)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "vte_terminal_get_column_count" vte_terminal_get_column_count :: 
     Ptr Terminal ->                         -- _obj : TInterface "Vte" "Terminal"
-    IO Int64
+    IO CLong
 
 
 terminalGetColumnCount ::
     (MonadIO m, TerminalK a) =>
     a                                       -- _obj
-    -> m Int64                              -- result
+    -> m CLong                              -- result
 terminalGetColumnCount _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- vte_terminal_get_column_count _obj'
@@ -3596,14 +3740,14 @@
     return result
 
 data TerminalGetColumnCountMethodInfo
-instance (signature ~ (m Int64), MonadIO m, TerminalK a) => MethodInfo TerminalGetColumnCountMethodInfo a signature where
+instance (signature ~ (m CLong), MonadIO m, TerminalK a) => MethodInfo TerminalGetColumnCountMethodInfo a signature where
     overloadedMethod _ = terminalGetColumnCount
 
 -- method Terminal::get_current_directory_uri
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -3632,7 +3776,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -3661,7 +3805,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Vte" "CursorBlinkMode"
+-- returnType : Just (TInterface "Vte" "CursorBlinkMode")
 -- throws : False
 -- Skip return : False
 
@@ -3687,27 +3831,27 @@
 
 -- method Terminal::get_cursor_position
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "column", argType = TBasicType TInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "row", argType = TBasicType TInt64, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "column", argType = TBasicType TLong, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "row", argType = TBasicType TLong, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "vte_terminal_get_cursor_position" vte_terminal_get_cursor_position :: 
     Ptr Terminal ->                         -- _obj : TInterface "Vte" "Terminal"
-    Ptr Int64 ->                            -- column : TBasicType TInt64
-    Ptr Int64 ->                            -- row : TBasicType TInt64
+    Ptr CLong ->                            -- column : TBasicType TLong
+    Ptr CLong ->                            -- row : TBasicType TLong
     IO ()
 
 
 terminalGetCursorPosition ::
     (MonadIO m, TerminalK a) =>
     a                                       -- _obj
-    -> m (Int64,Int64)                      -- result
+    -> m (CLong,CLong)                      -- result
 terminalGetCursorPosition _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
-    column <- allocMem :: IO (Ptr Int64)
-    row <- allocMem :: IO (Ptr Int64)
+    column <- allocMem :: IO (Ptr CLong)
+    row <- allocMem :: IO (Ptr CLong)
     vte_terminal_get_cursor_position _obj' column row
     column' <- peek column
     row' <- peek row
@@ -3717,14 +3861,14 @@
     return (column', row')
 
 data TerminalGetCursorPositionMethodInfo
-instance (signature ~ (m (Int64,Int64)), MonadIO m, TerminalK a) => MethodInfo TerminalGetCursorPositionMethodInfo a signature where
+instance (signature ~ (m (CLong,CLong)), MonadIO m, TerminalK a) => MethodInfo TerminalGetCursorPositionMethodInfo a signature where
     overloadedMethod _ = terminalGetCursorPosition
 
 -- method Terminal::get_cursor_shape
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Vte" "CursorShape"
+-- returnType : Just (TInterface "Vte" "CursorShape")
 -- throws : False
 -- Skip return : False
 
@@ -3752,7 +3896,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -3781,7 +3925,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Pango" "FontDescription"
+-- returnType : Just (TInterface "Pango" "FontDescription")
 -- throws : False
 -- Skip return : False
 
@@ -3810,7 +3954,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TDouble
+-- returnType : Just (TBasicType TDouble)
 -- throws : False
 -- Skip return : False
 
@@ -3836,17 +3980,17 @@
 
 -- method Terminal::get_geometry_hints
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "hints", argType = TInterface "Gdk" "Geometry", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = True, transfer = TransferNothing},Arg {argCName = "min_rows", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "min_columns", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "hints", argType = TInterface "Gdk" "Geometry", direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = True, transfer = TransferNothing},Arg {argCName = "min_rows", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "min_columns", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "vte_terminal_get_geometry_hints" vte_terminal_get_geometry_hints :: 
     Ptr Terminal ->                         -- _obj : TInterface "Vte" "Terminal"
     Ptr Gdk.Geometry ->                     -- hints : TInterface "Gdk" "Geometry"
-    Int32 ->                                -- min_rows : TBasicType TInt32
-    Int32 ->                                -- min_columns : TBasicType TInt32
+    Int32 ->                                -- min_rows : TBasicType TInt
+    Int32 ->                                -- min_columns : TBasicType TInt
     IO ()
 
 
@@ -3872,7 +4016,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -3900,7 +4044,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -3929,7 +4073,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -3957,7 +4101,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -3985,7 +4129,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Vte" "Pty"
+-- returnType : Just (TInterface "Vte" "Pty")
 -- throws : False
 -- Skip return : False
 
@@ -4014,7 +4158,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -4042,19 +4186,19 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt64
+-- returnType : Just (TBasicType TLong)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "vte_terminal_get_row_count" vte_terminal_get_row_count :: 
     Ptr Terminal ->                         -- _obj : TInterface "Vte" "Terminal"
-    IO Int64
+    IO CLong
 
 
 terminalGetRowCount ::
     (MonadIO m, TerminalK a) =>
     a                                       -- _obj
-    -> m Int64                              -- result
+    -> m CLong                              -- result
 terminalGetRowCount _obj = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
     result <- vte_terminal_get_row_count _obj'
@@ -4062,21 +4206,21 @@
     return result
 
 data TerminalGetRowCountMethodInfo
-instance (signature ~ (m Int64), MonadIO m, TerminalK a) => MethodInfo TerminalGetRowCountMethodInfo a signature where
+instance (signature ~ (m CLong), MonadIO m, TerminalK a) => MethodInfo TerminalGetRowCountMethodInfo a signature where
     overloadedMethod _ = terminalGetRowCount
 
 -- method Terminal::get_text
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "is_selected", argType = TInterface "Vte" "SelectionFunc", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeCall, argClosure = 2, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attributes", argType = TGArray (TInterface "Vte" "CharAttributes"), direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = True, transfer = TransferEverything}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "is_selected", argType = TInterface "Vte" "SelectionFunc", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeCall, argClosure = 2, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attributes", argType = TGArray (TInterface "Vte" "CharAttributes"), direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = True, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "vte_terminal_get_text" vte_terminal_get_text :: 
     Ptr Terminal ->                         -- _obj : TInterface "Vte" "Terminal"
     FunPtr SelectionFuncC ->                -- is_selected : TInterface "Vte" "SelectionFunc"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     Ptr (Ptr (GArray (Ptr CharAttributes))) -> -- attributes : TGArray (TInterface "Vte" "CharAttributes")
     IO CString
 
@@ -4114,16 +4258,16 @@
 
 -- method Terminal::get_text_include_trailing_spaces
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "is_selected", argType = TInterface "Vte" "SelectionFunc", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeCall, argClosure = 2, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attributes", argType = TGArray (TInterface "Vte" "CharAttributes"), direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = True, transfer = TransferEverything}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "is_selected", argType = TInterface "Vte" "SelectionFunc", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeCall, argClosure = 2, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attributes", argType = TGArray (TInterface "Vte" "CharAttributes"), direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = True, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "vte_terminal_get_text_include_trailing_spaces" vte_terminal_get_text_include_trailing_spaces :: 
     Ptr Terminal ->                         -- _obj : TInterface "Vte" "Terminal"
     FunPtr SelectionFuncC ->                -- is_selected : TInterface "Vte" "SelectionFunc"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     Ptr (Ptr (GArray (Ptr CharAttributes))) -> -- attributes : TGArray (TInterface "Vte" "CharAttributes")
     IO CString
 
@@ -4161,20 +4305,20 @@
 
 -- method Terminal::get_text_range
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "start_row", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "start_col", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "end_row", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "end_col", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "is_selected", argType = TInterface "Vte" "SelectionFunc", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeCall, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attributes", argType = TGArray (TInterface "Vte" "CharAttributes"), direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = True, transfer = TransferEverything}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "start_row", argType = TBasicType TLong, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "start_col", argType = TBasicType TLong, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "end_row", argType = TBasicType TLong, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "end_col", argType = TBasicType TLong, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "is_selected", argType = TInterface "Vte" "SelectionFunc", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeCall, argClosure = 6, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "user_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "attributes", argType = TGArray (TInterface "Vte" "CharAttributes"), direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = True, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "vte_terminal_get_text_range" vte_terminal_get_text_range :: 
     Ptr Terminal ->                         -- _obj : TInterface "Vte" "Terminal"
-    Int64 ->                                -- start_row : TBasicType TInt64
-    Int64 ->                                -- start_col : TBasicType TInt64
-    Int64 ->                                -- end_row : TBasicType TInt64
-    Int64 ->                                -- end_col : TBasicType TInt64
+    CLong ->                                -- start_row : TBasicType TLong
+    CLong ->                                -- start_col : TBasicType TLong
+    CLong ->                                -- end_row : TBasicType TLong
+    CLong ->                                -- end_col : TBasicType TLong
     FunPtr SelectionFuncC ->                -- is_selected : TInterface "Vte" "SelectionFunc"
-    Ptr () ->                               -- user_data : TBasicType TVoid
+    Ptr () ->                               -- user_data : TBasicType TPtr
     Ptr (Ptr (GArray (Ptr CharAttributes))) -> -- attributes : TGArray (TInterface "Vte" "CharAttributes")
     IO CString
 
@@ -4182,10 +4326,10 @@
 terminalGetTextRange ::
     (MonadIO m, TerminalK a) =>
     a                                       -- _obj
-    -> Int64                                -- startRow
-    -> Int64                                -- startCol
-    -> Int64                                -- endRow
-    -> Int64                                -- endCol
+    -> CLong                                -- startRow
+    -> CLong                                -- startCol
+    -> CLong                                -- endRow
+    -> CLong                                -- endCol
     -> Maybe (SelectionFunc)                -- isSelected
     -> m (T.Text,[CharAttributes])          -- result
 terminalGetTextRange _obj startRow startCol endRow endCol isSelected = liftIO $ do
@@ -4211,14 +4355,14 @@
     return (result', attributes''')
 
 data TerminalGetTextRangeMethodInfo
-instance (signature ~ (Int64 -> Int64 -> Int64 -> Int64 -> Maybe (SelectionFunc) -> m (T.Text,[CharAttributes])), MonadIO m, TerminalK a) => MethodInfo TerminalGetTextRangeMethodInfo a signature where
+instance (signature ~ (CLong -> CLong -> CLong -> CLong -> Maybe (SelectionFunc) -> m (T.Text,[CharAttributes])), MonadIO m, TerminalK a) => MethodInfo TerminalGetTextRangeMethodInfo a signature where
     overloadedMethod _ = terminalGetTextRange
 
 -- method Terminal::get_window_title
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -4247,7 +4391,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
@@ -4276,7 +4420,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "regex", argType = TInterface "GLib" "Regex", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "GLib" "RegexMatchFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TInt32
+-- returnType : Just (TBasicType TInt)
 -- throws : False
 -- Skip return : False
 
@@ -4308,25 +4452,25 @@
 
 -- method Terminal::match_check
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "column", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "row", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "tag", argType = TBasicType TInt32, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "column", argType = TBasicType TLong, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "row", argType = TBasicType TLong, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "tag", argType = TBasicType TInt, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "vte_terminal_match_check" vte_terminal_match_check :: 
     Ptr Terminal ->                         -- _obj : TInterface "Vte" "Terminal"
-    Int64 ->                                -- column : TBasicType TInt64
-    Int64 ->                                -- row : TBasicType TInt64
-    Ptr Int32 ->                            -- tag : TBasicType TInt32
+    CLong ->                                -- column : TBasicType TLong
+    CLong ->                                -- row : TBasicType TLong
+    Ptr Int32 ->                            -- tag : TBasicType TInt
     IO CString
 
 
 terminalMatchCheck ::
     (MonadIO m, TerminalK a) =>
     a                                       -- _obj
-    -> Int64                                -- column
-    -> Int64                                -- row
+    -> CLong                                -- column
+    -> CLong                                -- row
     -> m (T.Text,Int32)                     -- result
 terminalMatchCheck _obj column row = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
@@ -4341,21 +4485,21 @@
     return (result', tag')
 
 data TerminalMatchCheckMethodInfo
-instance (signature ~ (Int64 -> Int64 -> m (T.Text,Int32)), MonadIO m, TerminalK a) => MethodInfo TerminalMatchCheckMethodInfo a signature where
+instance (signature ~ (CLong -> CLong -> m (T.Text,Int32)), MonadIO m, TerminalK a) => MethodInfo TerminalMatchCheckMethodInfo a signature where
     overloadedMethod _ = terminalMatchCheck
 
 -- method Terminal::match_check_event
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "event", argType = TInterface "Gdk" "Event", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "tag", argType = TBasicType TInt32, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "event", argType = TInterface "Gdk" "Event", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "tag", argType = TBasicType TInt, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything}]
 -- Lengths : []
--- returnType : TBasicType TUTF8
+-- returnType : Just (TBasicType TUTF8)
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "vte_terminal_match_check_event" vte_terminal_match_check_event :: 
     Ptr Terminal ->                         -- _obj : TInterface "Vte" "Terminal"
     Ptr Gdk.Event ->                        -- event : TInterface "Gdk" "Event"
-    Ptr Int32 ->                            -- tag : TBasicType TInt32
+    Ptr Int32 ->                            -- tag : TBasicType TInt
     IO CString
 
 
@@ -4384,15 +4528,15 @@
 
 -- method Terminal::match_remove
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "tag", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "tag", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "vte_terminal_match_remove" vte_terminal_match_remove :: 
     Ptr Terminal ->                         -- _obj : TInterface "Vte" "Terminal"
-    Int32 ->                                -- tag : TBasicType TInt32
+    Int32 ->                                -- tag : TBasicType TInt
     IO ()
 
 
@@ -4415,7 +4559,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -4440,15 +4584,15 @@
 
 -- method Terminal::match_set_cursor_name
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "tag", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cursor_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "tag", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cursor_name", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "vte_terminal_match_set_cursor_name" vte_terminal_match_set_cursor_name :: 
     Ptr Terminal ->                         -- _obj : TInterface "Vte" "Terminal"
-    Int32 ->                                -- tag : TBasicType TInt32
+    Int32 ->                                -- tag : TBasicType TInt
     CString ->                              -- cursor_name : TBasicType TUTF8
     IO ()
 
@@ -4473,15 +4617,15 @@
 
 -- method Terminal::match_set_cursor_type
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "tag", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cursor_type", argType = TInterface "Gdk" "CursorType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "tag", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cursor_type", argType = TInterface "Gdk" "CursorType", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "vte_terminal_match_set_cursor_type" vte_terminal_match_set_cursor_type :: 
     Ptr Terminal ->                         -- _obj : TInterface "Vte" "Terminal"
-    Int32 ->                                -- tag : TBasicType TInt32
+    Int32 ->                                -- tag : TBasicType TInt
     CUInt ->                                -- cursor_type : TInterface "Gdk" "CursorType"
     IO ()
 
@@ -4507,7 +4651,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -4534,7 +4678,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -4561,7 +4705,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Vte" "PtyFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "Vte" "Pty"
+-- returnType : Just (TInterface "Vte" "Pty")
 -- throws : True
 -- Skip return : False
 
@@ -4606,7 +4750,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "clear_tabstops", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "clear_history", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -4639,7 +4783,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -4667,7 +4811,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -4695,7 +4839,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TInterface "GLib" "Regex"
+-- returnType : Just (TInterface "GLib" "Regex")
 -- throws : False
 -- Skip return : False
 
@@ -4724,7 +4868,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : False
 -- Skip return : False
 
@@ -4752,7 +4896,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "regex", argType = TInterface "GLib" "Regex", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "GLib" "RegexMatchFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -4790,7 +4934,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "wrap_around", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -4820,7 +4964,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -4847,7 +4991,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "allow_bold", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -4877,7 +5021,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "is_audible", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -4907,7 +5051,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "binding", argType = TInterface "Vte" "EraseBinding", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -4935,15 +5079,15 @@
 
 -- method Terminal::set_cjk_ambiguous_width
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "width", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "width", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "vte_terminal_set_cjk_ambiguous_width" vte_terminal_set_cjk_ambiguous_width :: 
     Ptr Terminal ->                         -- _obj : TInterface "Vte" "Terminal"
-    Int32 ->                                -- width : TBasicType TInt32
+    Int32 ->                                -- width : TBasicType TInt
     IO ()
 
 
@@ -4966,7 +5110,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "background", argType = TInterface "Gdk" "RGBA", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -4997,7 +5141,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "bold", argType = TInterface "Gdk" "RGBA", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -5032,7 +5176,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cursor_background", argType = TInterface "Gdk" "RGBA", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -5067,7 +5211,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "foreground", argType = TInterface "Gdk" "RGBA", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -5098,7 +5242,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "highlight_background", argType = TInterface "Gdk" "RGBA", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -5133,7 +5277,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "highlight_foreground", argType = TInterface "Gdk" "RGBA", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -5168,7 +5312,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "foreground", argType = TInterface "Gdk" "RGBA", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "background", argType = TInterface "Gdk" "RGBA", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "palette", argType = TCArray False (-1) 4 (TInterface "Gdk" "RGBA"), direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "palette_size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : [Arg {argCName = "palette_size", argType = TBasicType TUInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -5225,7 +5369,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "mode", argType = TInterface "Vte" "CursorBlinkMode", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -5255,7 +5399,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "shape", argType = TInterface "Vte" "CursorShape", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -5285,7 +5429,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -5312,7 +5456,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "binding", argType = TInterface "Vte" "EraseBinding", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -5342,7 +5486,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "codeset", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -5382,7 +5526,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "font_desc", argType = TInterface "Pango" "FontDescription", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -5417,7 +5561,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "scale", argType = TBasicType TDouble, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -5447,7 +5591,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "window", argType = TInterface "Gtk" "Window", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -5478,7 +5622,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "enabled", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -5508,7 +5652,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "setting", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -5538,7 +5682,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "pty", argType = TInterface "Vte" "Pty", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -5573,7 +5717,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "rewrap", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -5603,7 +5747,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "scroll", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -5633,7 +5777,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "scroll", argType = TBasicType TBoolean, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -5661,22 +5805,22 @@
 
 -- method Terminal::set_scrollback_lines
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "lines", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "lines", argType = TBasicType TLong, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "vte_terminal_set_scrollback_lines" vte_terminal_set_scrollback_lines :: 
     Ptr Terminal ->                         -- _obj : TInterface "Vte" "Terminal"
-    Int64 ->                                -- lines : TBasicType TInt64
+    CLong ->                                -- lines : TBasicType TLong
     IO ()
 
 
 terminalSetScrollbackLines ::
     (MonadIO m, TerminalK a) =>
     a                                       -- _obj
-    -> Int64                                -- lines
+    -> CLong                                -- lines
     -> m ()                                 -- result
 terminalSetScrollbackLines _obj lines = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
@@ -5685,29 +5829,29 @@
     return ()
 
 data TerminalSetScrollbackLinesMethodInfo
-instance (signature ~ (Int64 -> m ()), MonadIO m, TerminalK a) => MethodInfo TerminalSetScrollbackLinesMethodInfo a signature where
+instance (signature ~ (CLong -> m ()), MonadIO m, TerminalK a) => MethodInfo TerminalSetScrollbackLinesMethodInfo a signature where
     overloadedMethod _ = terminalSetScrollbackLines
 
 -- method Terminal::set_size
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "columns", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "rows", argType = TBasicType TInt64, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "columns", argType = TBasicType TLong, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "rows", argType = TBasicType TLong, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "vte_terminal_set_size" vte_terminal_set_size :: 
     Ptr Terminal ->                         -- _obj : TInterface "Vte" "Terminal"
-    Int64 ->                                -- columns : TBasicType TInt64
-    Int64 ->                                -- rows : TBasicType TInt64
+    CLong ->                                -- columns : TBasicType TLong
+    CLong ->                                -- rows : TBasicType TLong
     IO ()
 
 
 terminalSetSize ::
     (MonadIO m, TerminalK a) =>
     a                                       -- _obj
-    -> Int64                                -- columns
-    -> Int64                                -- rows
+    -> CLong                                -- columns
+    -> CLong                                -- rows
     -> m ()                                 -- result
 terminalSetSize _obj columns rows = liftIO $ do
     let _obj' = unsafeManagedPtrCastPtr _obj
@@ -5716,14 +5860,14 @@
     return ()
 
 data TerminalSetSizeMethodInfo
-instance (signature ~ (Int64 -> Int64 -> m ()), MonadIO m, TerminalK a) => MethodInfo TerminalSetSizeMethodInfo a signature where
+instance (signature ~ (CLong -> CLong -> m ()), MonadIO m, TerminalK a) => MethodInfo TerminalSetSizeMethodInfo a signature where
     overloadedMethod _ = terminalSetSize
 
 -- method Terminal::set_word_char_exceptions
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "exceptions", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -5752,9 +5896,9 @@
 
 -- method Terminal::spawn_sync
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "pty_flags", argType = TInterface "Vte" "PtyFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "working_directory", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "argv", argType = TCArray True (-1) (-1) (TBasicType TFileName), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "envv", argType = TCArray True (-1) (-1) (TBasicType TFileName), direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "spawn_flags", argType = TInterface "GLib" "SpawnFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "child_setup", argType = TInterface "GLib" "SpawnChildSetupFunc", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeCall, argClosure = 7, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "child_setup_data", argType = TBasicType TVoid, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "child_pid", argType = TBasicType TInt32, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "pty_flags", argType = TInterface "Vte" "PtyFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "working_directory", argType = TBasicType TUTF8, direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "argv", argType = TCArray True (-1) (-1) (TBasicType TFileName), direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "envv", argType = TCArray True (-1) (-1) (TBasicType TFileName), direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "spawn_flags", argType = TInterface "GLib" "SpawnFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "child_setup", argType = TInterface "GLib" "SpawnChildSetupFunc", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeCall, argClosure = 7, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "child_setup_data", argType = TBasicType TPtr, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "child_pid", argType = TBasicType TInt, direction = DirectionOut, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferEverything},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
@@ -5766,8 +5910,8 @@
     Ptr CString ->                          -- envv : TCArray True (-1) (-1) (TBasicType TFileName)
     CUInt ->                                -- spawn_flags : TInterface "GLib" "SpawnFlags"
     FunPtr GLib.SpawnChildSetupFuncC ->     -- child_setup : TInterface "GLib" "SpawnChildSetupFunc"
-    Ptr () ->                               -- child_setup_data : TBasicType TVoid
-    Ptr Int32 ->                            -- child_pid : TBasicType TInt32
+    Ptr () ->                               -- child_setup_data : TBasicType TPtr
+    Ptr Int32 ->                            -- child_pid : TBasicType TInt
     Ptr Gio.Cancellable ->                  -- cancellable : TInterface "Gio" "Cancellable"
     Ptr (Ptr GError) ->                     -- error
     IO CInt
@@ -5842,7 +5986,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
@@ -5867,15 +6011,15 @@
 
 -- method Terminal::watch_child
 -- method type : OrdinaryMethod
--- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "child_pid", argType = TBasicType TInt32, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
+-- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "child_pid", argType = TBasicType TInt, direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TVoid
+-- returnType : Nothing
 -- throws : False
 -- Skip return : False
 
 foreign import ccall "vte_terminal_watch_child" vte_terminal_watch_child :: 
     Ptr Terminal ->                         -- _obj : TInterface "Vte" "Terminal"
-    Int32 ->                                -- child_pid : TBasicType TInt32
+    Int32 ->                                -- child_pid : TBasicType TInt
     IO ()
 
 
@@ -5898,7 +6042,7 @@
 -- method type : OrdinaryMethod
 -- Args : [Arg {argCName = "_obj", argType = TInterface "Vte" "Terminal", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "stream", argType = TInterface "Gio" "OutputStream", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "flags", argType = TInterface "Vte" "WriteFlags", direction = DirectionIn, mayBeNull = False, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing},Arg {argCName = "cancellable", argType = TInterface "Gio" "Cancellable", direction = DirectionIn, mayBeNull = True, argScope = ScopeTypeInvalid, argClosure = -1, argDestroy = -1, argCallerAllocates = False, transfer = TransferNothing}]
 -- Lengths : []
--- returnType : TBasicType TBoolean
+-- returnType : Just (TBasicType TBoolean)
 -- throws : True
 -- Skip return : False
 
diff --git a/GI/Vte/Objects/Terminal.hs-boot b/GI/Vte/Objects/Terminal.hs-boot
--- a/GI/Vte/Objects/Terminal.hs-boot
+++ b/GI/Vte/Objects/Terminal.hs-boot
@@ -1,8 +1,8 @@
 module GI.Vte.Objects.Terminal where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Vte/Structs.hs b/GI/Vte/Structs.hs
--- a/GI/Vte/Structs.hs
+++ b/GI/Vte/Structs.hs
@@ -14,9 +14,9 @@
 
 import GI.Vte.Structs.CharAttributes
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/GI/Vte/Structs/CharAttributes.hs b/GI/Vte/Structs/CharAttributes.hs
--- a/GI/Vte/Structs/CharAttributes.hs
+++ b/GI/Vte/Structs/CharAttributes.hs
@@ -17,9 +17,9 @@
 
     ) where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
@@ -32,8 +32,19 @@
 newZeroCharAttributes :: MonadIO m => m CharAttributes
 newZeroCharAttributes = liftIO $ callocBytes 40 >>= wrapPtr CharAttributes
 
+instance tag ~ 'AttrSet => Constructible CharAttributes tag where
+    new _ attrs = do
+        o <- newZeroCharAttributes
+        GI.Attributes.set o attrs
+        return o
+
+
 noCharAttributes :: Maybe CharAttributes
 noCharAttributes = Nothing
+
+
+type instance AttributeList CharAttributes = CharAttributesAttributeList
+type CharAttributesAttributeList = ('[ ] :: [(Symbol, *)])
 
 type family ResolveCharAttributesMethod (t :: Symbol) (o :: *) :: * where
     ResolveCharAttributesMethod l o = MethodResolutionFailed l o
diff --git a/GI/Vte/Structs/CharAttributes.hs-boot b/GI/Vte/Structs/CharAttributes.hs-boot
--- a/GI/Vte/Structs/CharAttributes.hs-boot
+++ b/GI/Vte/Structs/CharAttributes.hs-boot
@@ -1,8 +1,8 @@
 module GI.Vte.Structs.CharAttributes where
 
-import Prelude ()
 import Data.GI.Base.ShortPrelude
 
+import qualified Data.GI.Base.Attributes as GI.Attributes
 import qualified Data.Text as T
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Map as Map
diff --git a/gi-vte.cabal b/gi-vte.cabal
--- a/gi-vte.cabal
+++ b/gi-vte.cabal
@@ -1,6 +1,6 @@
 -- Autogenerated, do not edit.
 name:               gi-vte
-version:            0.0.42.13
+version:            0.0.42.14
 synopsis:           Vte bindings
 description:        Bindings for Vte, autogenerated by haskell-gi.
 homepage:           https://github.com/haskell-gi/haskell-gi
@@ -14,7 +14,7 @@
 
 library
     default-language:   Haskell2010
-    default-extensions: ScopedTypeVariables, CPP, OverloadedStrings, NegativeLiterals, ConstraintKinds, TypeFamilies, MultiParamTypeClasses, KindSignatures, FlexibleInstances, UndecidableInstances, DataKinds, FlexibleContexts
+    default-extensions: NoImplicitPrelude, ScopedTypeVariables, CPP, OverloadedStrings, NegativeLiterals, ConstraintKinds, TypeFamilies, MultiParamTypeClasses, KindSignatures, FlexibleInstances, UndecidableInstances, DataKinds, FlexibleContexts
     other-extensions:   PatternSynonyms ViewPatterns
     ghc-options:        -fno-warn-unused-imports -fno-warn-warnings-deprecations
     exposed-modules:    GI.Vte.Types
@@ -31,14 +31,14 @@
                         GI.Vte.Structs.CharAttributes
     pkgconfig-depends:  vte-2.91 >= 0.42
     build-depends: base >= 4.7 && <5,
-        haskell-gi-base >= 0.13 && < 1,
-        gi-atk >= 0.2.18.13 && < 0.2.19,
-        gi-glib >= 0.2.46.13 && < 0.2.47,
-        gi-gobject >= 0.2.46.13 && < 0.2.47,
-        gi-gdk >= 0.3.18.13 && < 0.3.19,
-        gi-gio >= 0.2.46.13 && < 0.2.47,
-        gi-gtk >= 0.3.18.13 && < 0.3.19,
-        gi-pango >= 0.1.38.13 && < 0.1.39,
+        haskell-gi-base >= 0.14 && < 1,
+        gi-atk >= 0.2.18.14 && < 0.2.19,
+        gi-glib >= 0.2.46.14 && < 0.2.47,
+        gi-gobject >= 0.2.46.14 && < 0.2.47,
+        gi-gdk >= 0.3.18.14 && < 0.3.19,
+        gi-gio >= 0.2.46.14 && < 0.2.47,
+        gi-gtk >= 0.3.18.14 && < 0.3.19,
+        gi-pango >= 0.1.38.14 && < 0.1.39,
         bytestring >= 0.10,
         containers >= 0.5,
         text >= 1.0,
