diff --git a/nexgb/bigreq/bigreq.go b/nexgb/bigreq/bigreq.go
index 43a15a4..e7bdfc8 100644
--- a/nexgb/bigreq/bigreq.go
+++ b/nexgb/bigreq/bigreq.go
@@ -2,7 +2,7 @@
 package bigreq
 
 /*
-	This file was generated by bigreq.xml on May 11 2012 11:57:18pm EDT.
+	This file was generated by bigreq.xml on May 26 2012 6:23:12pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,12 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["BIG-REQUESTS"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Bool'
-
-// Skipping definition for base type 'Float'
-
-// Skipping definition for base type 'Card8'
-
 // Skipping definition for base type 'Int16'
 
 // Skipping definition for base type 'Int32'
@@ -64,6 +58,12 @@ func init() {
 
 // Skipping definition for base type 'Double'
 
+// Skipping definition for base type 'Bool'
+
+// Skipping definition for base type 'Float'
+
+// Skipping definition for base type 'Card8'
+
 // EnableCookie is a cookie used only for Enable requests.
 type EnableCookie struct {
 	*xgb.Cookie
diff --git a/nexgb/composite/composite.go b/nexgb/composite/composite.go
index 68e8dbe..b188544 100644
--- a/nexgb/composite/composite.go
+++ b/nexgb/composite/composite.go
@@ -2,7 +2,7 @@
 package composite
 
 /*
-	This file was generated by composite.xml on May 11 2012 11:57:18pm EDT.
+	This file was generated by composite.xml on May 26 2012 6:23:12pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -41,6 +41,10 @@ func init() {
 	xgb.NewExtErrorFuncs["Composite"] = make(map[int]xgb.NewErrorFun)
 }
 
+// Skipping definition for base type 'Float'
+
+// Skipping definition for base type 'Card8'
+
 // Skipping definition for base type 'Int16'
 
 // Skipping definition for base type 'Int32'
@@ -61,10 +65,6 @@ func init() {
 
 // Skipping definition for base type 'Bool'
 
-// Skipping definition for base type 'Float'
-
-// Skipping definition for base type 'Card8'
-
 const (
 	RedirectAutomatic = 0
 	RedirectManual    = 1
diff --git a/nexgb/damage/damage.go b/nexgb/damage/damage.go
index f9aee61..1c844db 100644
--- a/nexgb/damage/damage.go
+++ b/nexgb/damage/damage.go
@@ -2,7 +2,7 @@
 package damage
 
 /*
-	This file was generated by damage.xml on May 11 2012 11:57:19pm EDT.
+	This file was generated by damage.xml on May 26 2012 6:23:12pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -41,18 +41,6 @@ func init() {
 	xgb.NewExtErrorFuncs["DAMAGE"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Card8'
-
-// Skipping definition for base type 'Int16'
-
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
-// Skipping definition for base type 'Int8'
-
 // Skipping definition for base type 'Card16'
 
 // Skipping definition for base type 'Char'
@@ -65,6 +53,18 @@ func init() {
 
 // Skipping definition for base type 'Float'
 
+// Skipping definition for base type 'Card8'
+
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
+// Skipping definition for base type 'Int8'
+
 const (
 	ReportLevelRawRectangles   = 0
 	ReportLevelDeltaRectangles = 1
diff --git a/nexgb/dpms/dpms.go b/nexgb/dpms/dpms.go
index d1142ce..0ef913c 100644
--- a/nexgb/dpms/dpms.go
+++ b/nexgb/dpms/dpms.go
@@ -2,7 +2,7 @@
 package dpms
 
 /*
-	This file was generated by dpms.xml on May 11 2012 11:57:19pm EDT.
+	This file was generated by dpms.xml on May 26 2012 6:23:12pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,18 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["DPMS"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Double'
-
-// Skipping definition for base type 'Bool'
-
-// Skipping definition for base type 'Float'
-
-// Skipping definition for base type 'Card8'
-
-// Skipping definition for base type 'Int16'
-
-// Skipping definition for base type 'Int32'
-
 // Skipping definition for base type 'Void'
 
 // Skipping definition for base type 'Byte'
@@ -64,6 +52,18 @@ func init() {
 
 // Skipping definition for base type 'Card32'
 
+// Skipping definition for base type 'Double'
+
+// Skipping definition for base type 'Bool'
+
+// Skipping definition for base type 'Float'
+
+// Skipping definition for base type 'Card8'
+
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
 const (
 	DPMSModeOn      = 0
 	DPMSModeStandby = 1
diff --git a/nexgb/dri2/dri2.go b/nexgb/dri2/dri2.go
index 7a10897..5ad8c62 100644
--- a/nexgb/dri2/dri2.go
+++ b/nexgb/dri2/dri2.go
@@ -2,7 +2,7 @@
 package dri2
 
 /*
-	This file was generated by dri2.xml on May 11 2012 11:57:19pm EDT.
+	This file was generated by dri2.xml on May 26 2012 6:23:13pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,18 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["DRI2"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Float'
-
-// Skipping definition for base type 'Card8'
-
-// Skipping definition for base type 'Int16'
-
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
 // Skipping definition for base type 'Int8'
 
 // Skipping definition for base type 'Card16'
@@ -64,6 +52,18 @@ func init() {
 
 // Skipping definition for base type 'Bool'
 
+// Skipping definition for base type 'Float'
+
+// Skipping definition for base type 'Card8'
+
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
 const (
 	AttachmentBufferFrontLeft      = 0
 	AttachmentBufferBackLeft       = 1
@@ -152,7 +152,7 @@ func (v DRI2Buffer) Bytes() []byte {
 	return buf
 }
 
-// DRI2BufferListBytes writes a list of %s(MISSING) values to a byte slice.
+// DRI2BufferListBytes writes a list of DRI2Buffer values to a byte slice.
 func DRI2BufferListBytes(buf []byte, list []DRI2Buffer) int {
 	b := 0
 	var structBytes []byte
@@ -206,7 +206,7 @@ func (v AttachFormat) Bytes() []byte {
 	return buf
 }
 
-// AttachFormatListBytes writes a list of %s(MISSING) values to a byte slice.
+// AttachFormatListBytes writes a list of AttachFormat values to a byte slice.
 func AttachFormatListBytes(buf []byte, list []AttachFormat) int {
 	b := 0
 	var structBytes []byte
diff --git a/nexgb/ge/ge.go b/nexgb/ge/ge.go
index e7592d8..b0bbbd7 100644
--- a/nexgb/ge/ge.go
+++ b/nexgb/ge/ge.go
@@ -2,7 +2,7 @@
 package ge
 
 /*
-	This file was generated by ge.xml on May 11 2012 11:57:19pm EDT.
+	This file was generated by ge.xml on May 26 2012 6:23:13pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,8 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["Generic Event Extension"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Card8'
-
 // Skipping definition for base type 'Int16'
 
 // Skipping definition for base type 'Int32'
@@ -64,6 +62,8 @@ func init() {
 
 // Skipping definition for base type 'Float'
 
+// Skipping definition for base type 'Card8'
+
 // QueryVersionCookie is a cookie used only for QueryVersion requests.
 type QueryVersionCookie struct {
 	*xgb.Cookie
diff --git a/nexgb/glx/glx.go b/nexgb/glx/glx.go
index 0f67127..6be52c2 100644
--- a/nexgb/glx/glx.go
+++ b/nexgb/glx/glx.go
@@ -2,7 +2,7 @@
 package glx
 
 /*
-	This file was generated by glx.xml on May 11 2012 11:57:19pm EDT.
+	This file was generated by glx.xml on May 26 2012 6:23:13pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
diff --git a/nexgb/randr/randr.go b/nexgb/randr/randr.go
index 9a6e89f..b17cb83 100644
--- a/nexgb/randr/randr.go
+++ b/nexgb/randr/randr.go
@@ -2,7 +2,7 @@
 package randr
 
 /*
-	This file was generated by randr.xml on May 11 2012 11:57:19pm EDT.
+	This file was generated by randr.xml on May 26 2012 6:23:13pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -41,8 +41,6 @@ func init() {
 	xgb.NewExtErrorFuncs["RANDR"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Card8'
-
 // Skipping definition for base type 'Int16'
 
 // Skipping definition for base type 'Int32'
@@ -65,6 +63,8 @@ func init() {
 
 // Skipping definition for base type 'Float'
 
+// Skipping definition for base type 'Card8'
+
 const (
 	RotationRotate0   = 1
 	RotationRotate90  = 2
@@ -203,7 +203,7 @@ func (v ScreenSize) Bytes() []byte {
 	return buf
 }
 
-// ScreenSizeListBytes writes a list of %s(MISSING) values to a byte slice.
+// ScreenSizeListBytes writes a list of ScreenSize values to a byte slice.
 func ScreenSizeListBytes(buf []byte, list []ScreenSize) int {
 	b := 0
 	var structBytes []byte
@@ -264,7 +264,7 @@ func (v RefreshRates) Bytes() []byte {
 	return buf
 }
 
-// RefreshRatesListBytes writes a list of %s(MISSING) values to a byte slice.
+// RefreshRatesListBytes writes a list of RefreshRates values to a byte slice.
 func RefreshRatesListBytes(buf []byte, list []RefreshRates) int {
 	b := 0
 	var structBytes []byte
@@ -404,7 +404,7 @@ func (v ModeInfo) Bytes() []byte {
 	return buf
 }
 
-// ModeInfoListBytes writes a list of %s(MISSING) values to a byte slice.
+// ModeInfoListBytes writes a list of ModeInfo values to a byte slice.
 func ModeInfoListBytes(buf []byte, list []ModeInfo) int {
 	b := 0
 	var structBytes []byte
@@ -512,7 +512,7 @@ func (v CrtcChange) Bytes() []byte {
 	return buf
 }
 
-// CrtcChangeListBytes writes a list of %s(MISSING) values to a byte slice.
+// CrtcChangeListBytes writes a list of CrtcChange values to a byte slice.
 func CrtcChangeListBytes(buf []byte, list []CrtcChange) int {
 	b := 0
 	var structBytes []byte
@@ -615,7 +615,7 @@ func (v OutputChange) Bytes() []byte {
 	return buf
 }
 
-// OutputChangeListBytes writes a list of %s(MISSING) values to a byte slice.
+// OutputChangeListBytes writes a list of OutputChange values to a byte slice.
 func OutputChangeListBytes(buf []byte, list []OutputChange) int {
 	b := 0
 	var structBytes []byte
@@ -695,7 +695,7 @@ func (v OutputProperty) Bytes() []byte {
 	return buf
 }
 
-// OutputPropertyListBytes writes a list of %s(MISSING) values to a byte slice.
+// OutputPropertyListBytes writes a list of OutputProperty values to a byte slice.
 func OutputPropertyListBytes(buf []byte, list []OutputProperty) int {
 	b := 0
 	var structBytes []byte
diff --git a/nexgb/record/record.go b/nexgb/record/record.go
index a9ae7ea..0ae6d81 100644
--- a/nexgb/record/record.go
+++ b/nexgb/record/record.go
@@ -2,7 +2,7 @@
 package record
 
 /*
-	This file was generated by record.xml on May 11 2012 11:57:19pm EDT.
+	This file was generated by record.xml on May 26 2012 6:23:13pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,8 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["RECORD"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Float'
-
 // Skipping definition for base type 'Card8'
 
 // Skipping definition for base type 'Int16'
@@ -64,6 +62,8 @@ func init() {
 
 // Skipping definition for base type 'Bool'
 
+// Skipping definition for base type 'Float'
+
 const (
 	HTypeFromServerTime     = 1
 	HTypeFromClientTime     = 2
@@ -132,7 +132,7 @@ func (v Range8) Bytes() []byte {
 	return buf
 }
 
-// Range8ListBytes writes a list of %s(MISSING) values to a byte slice.
+// Range8ListBytes writes a list of Range8 values to a byte slice.
 func Range8ListBytes(buf []byte, list []Range8) int {
 	b := 0
 	var structBytes []byte
@@ -186,7 +186,7 @@ func (v Range16) Bytes() []byte {
 	return buf
 }
 
-// Range16ListBytes writes a list of %s(MISSING) values to a byte slice.
+// Range16ListBytes writes a list of Range16 values to a byte slice.
 func Range16ListBytes(buf []byte, list []Range16) int {
 	b := 0
 	var structBytes []byte
@@ -246,7 +246,7 @@ func (v ExtRange) Bytes() []byte {
 	return buf
 }
 
-// ExtRangeListBytes writes a list of %s(MISSING) values to a byte slice.
+// ExtRangeListBytes writes a list of ExtRange values to a byte slice.
 func ExtRangeListBytes(buf []byte, list []ExtRange) int {
 	b := 0
 	var structBytes []byte
@@ -386,7 +386,7 @@ func (v Range) Bytes() []byte {
 	return buf
 }
 
-// RangeListBytes writes a list of %s(MISSING) values to a byte slice.
+// RangeListBytes writes a list of Range values to a byte slice.
 func RangeListBytes(buf []byte, list []Range) int {
 	b := 0
 	var structBytes []byte
@@ -446,7 +446,7 @@ func (v ClientInfo) Bytes() []byte {
 	return buf
 }
 
-// ClientInfoListBytes writes a list of %s(MISSING) values to a byte slice.
+// ClientInfoListBytes writes a list of ClientInfo values to a byte slice.
 func ClientInfoListBytes(buf []byte, list []ClientInfo) int {
 	b := 0
 	var structBytes []byte
diff --git a/nexgb/render/render.go b/nexgb/render/render.go
index f7fa79f..e435aa8 100644
--- a/nexgb/render/render.go
+++ b/nexgb/render/render.go
@@ -2,7 +2,7 @@
 package render
 
 /*
-	This file was generated by render.xml on May 11 2012 11:57:19pm EDT.
+	This file was generated by render.xml on May 26 2012 6:23:13pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,18 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["RENDER"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Float'
-
-// Skipping definition for base type 'Card8'
-
-// Skipping definition for base type 'Int16'
-
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
 // Skipping definition for base type 'Int8'
 
 // Skipping definition for base type 'Card16'
@@ -64,6 +52,18 @@ func init() {
 
 // Skipping definition for base type 'Bool'
 
+// Skipping definition for base type 'Float'
+
+// Skipping definition for base type 'Card8'
+
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
 const (
 	PictTypeIndexed = 0
 	PictTypeDirect  = 1
@@ -289,7 +289,7 @@ func (v Directformat) Bytes() []byte {
 	return buf
 }
 
-// DirectformatListBytes writes a list of %s(MISSING) values to a byte slice.
+// DirectformatListBytes writes a list of Directformat values to a byte slice.
 func DirectformatListBytes(buf []byte, list []Directformat) int {
 	b := 0
 	var structBytes []byte
@@ -372,7 +372,7 @@ func (v Pictforminfo) Bytes() []byte {
 	return buf
 }
 
-// PictforminfoListBytes writes a list of %s(MISSING) values to a byte slice.
+// PictforminfoListBytes writes a list of Pictforminfo values to a byte slice.
 func PictforminfoListBytes(buf []byte, list []Pictforminfo) int {
 	b := 0
 	var structBytes []byte
@@ -426,7 +426,7 @@ func (v Pictvisual) Bytes() []byte {
 	return buf
 }
 
-// PictvisualListBytes writes a list of %s(MISSING) values to a byte slice.
+// PictvisualListBytes writes a list of Pictvisual values to a byte slice.
 func PictvisualListBytes(buf []byte, list []Pictvisual) int {
 	b := 0
 	var structBytes []byte
@@ -496,7 +496,7 @@ func (v Pictdepth) Bytes() []byte {
 	return buf
 }
 
-// PictdepthListBytes writes a list of %s(MISSING) values to a byte slice.
+// PictdepthListBytes writes a list of Pictdepth values to a byte slice.
 func PictdepthListBytes(buf []byte, list []Pictdepth) int {
 	b := 0
 	var structBytes []byte
@@ -565,7 +565,7 @@ func (v Pictscreen) Bytes() []byte {
 	return buf
 }
 
-// PictscreenListBytes writes a list of %s(MISSING) values to a byte slice.
+// PictscreenListBytes writes a list of Pictscreen values to a byte slice.
 func PictscreenListBytes(buf []byte, list []Pictscreen) int {
 	b := 0
 	var structBytes []byte
@@ -649,7 +649,7 @@ func (v Indexvalue) Bytes() []byte {
 	return buf
 }
 
-// IndexvalueListBytes writes a list of %s(MISSING) values to a byte slice.
+// IndexvalueListBytes writes a list of Indexvalue values to a byte slice.
 func IndexvalueListBytes(buf []byte, list []Indexvalue) int {
 	b := 0
 	var structBytes []byte
@@ -717,7 +717,7 @@ func (v Color) Bytes() []byte {
 	return buf
 }
 
-// ColorListBytes writes a list of %s(MISSING) values to a byte slice.
+// ColorListBytes writes a list of Color values to a byte slice.
 func ColorListBytes(buf []byte, list []Color) int {
 	b := 0
 	var structBytes []byte
@@ -771,7 +771,7 @@ func (v Pointfix) Bytes() []byte {
 	return buf
 }
 
-// PointfixListBytes writes a list of %s(MISSING) values to a byte slice.
+// PointfixListBytes writes a list of Pointfix values to a byte slice.
 func PointfixListBytes(buf []byte, list []Pointfix) int {
 	b := 0
 	var structBytes []byte
@@ -831,7 +831,7 @@ func (v Linefix) Bytes() []byte {
 	return buf
 }
 
-// LinefixListBytes writes a list of %s(MISSING) values to a byte slice.
+// LinefixListBytes writes a list of Linefix values to a byte slice.
 func LinefixListBytes(buf []byte, list []Linefix) int {
 	b := 0
 	var structBytes []byte
@@ -901,7 +901,7 @@ func (v Triangle) Bytes() []byte {
 	return buf
 }
 
-// TriangleListBytes writes a list of %s(MISSING) values to a byte slice.
+// TriangleListBytes writes a list of Triangle values to a byte slice.
 func TriangleListBytes(buf []byte, list []Triangle) int {
 	b := 0
 	var structBytes []byte
@@ -975,7 +975,7 @@ func (v Trapezoid) Bytes() []byte {
 	return buf
 }
 
-// TrapezoidListBytes writes a list of %s(MISSING) values to a byte slice.
+// TrapezoidListBytes writes a list of Trapezoid values to a byte slice.
 func TrapezoidListBytes(buf []byte, list []Trapezoid) int {
 	b := 0
 	var structBytes []byte
@@ -1057,7 +1057,7 @@ func (v Glyphinfo) Bytes() []byte {
 	return buf
 }
 
-// GlyphinfoListBytes writes a list of %s(MISSING) values to a byte slice.
+// GlyphinfoListBytes writes a list of Glyphinfo values to a byte slice.
 func GlyphinfoListBytes(buf []byte, list []Glyphinfo) int {
 	b := 0
 	var structBytes []byte
@@ -1160,7 +1160,7 @@ func (v Transform) Bytes() []byte {
 	return buf
 }
 
-// TransformListBytes writes a list of %s(MISSING) values to a byte slice.
+// TransformListBytes writes a list of Transform values to a byte slice.
 func TransformListBytes(buf []byte, list []Transform) int {
 	b := 0
 	var structBytes []byte
@@ -1214,7 +1214,7 @@ func (v Animcursorelt) Bytes() []byte {
 	return buf
 }
 
-// AnimcursoreltListBytes writes a list of %s(MISSING) values to a byte slice.
+// AnimcursoreltListBytes writes a list of Animcursorelt values to a byte slice.
 func AnimcursoreltListBytes(buf []byte, list []Animcursorelt) int {
 	b := 0
 	var structBytes []byte
@@ -1275,7 +1275,7 @@ func (v Spanfix) Bytes() []byte {
 	return buf
 }
 
-// SpanfixListBytes writes a list of %s(MISSING) values to a byte slice.
+// SpanfixListBytes writes a list of Spanfix values to a byte slice.
 func SpanfixListBytes(buf []byte, list []Spanfix) int {
 	b := 0
 	var structBytes []byte
@@ -1335,7 +1335,7 @@ func (v Trap) Bytes() []byte {
 	return buf
 }
 
-// TrapListBytes writes a list of %s(MISSING) values to a byte slice.
+// TrapListBytes writes a list of Trap values to a byte slice.
 func TrapListBytes(buf []byte, list []Trap) int {
 	b := 0
 	var structBytes []byte
diff --git a/nexgb/res/res.go b/nexgb/res/res.go
index c5700c3..3859f34 100644
--- a/nexgb/res/res.go
+++ b/nexgb/res/res.go
@@ -2,7 +2,7 @@
 package res
 
 /*
-	This file was generated by res.xml on May 11 2012 11:57:19pm EDT.
+	This file was generated by res.xml on May 26 2012 6:23:13pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -106,7 +106,7 @@ func (v Client) Bytes() []byte {
 	return buf
 }
 
-// ClientListBytes writes a list of %s(MISSING) values to a byte slice.
+// ClientListBytes writes a list of Client values to a byte slice.
 func ClientListBytes(buf []byte, list []Client) int {
 	b := 0
 	var structBytes []byte
@@ -160,7 +160,7 @@ func (v Type) Bytes() []byte {
 	return buf
 }
 
-// TypeListBytes writes a list of %s(MISSING) values to a byte slice.
+// TypeListBytes writes a list of Type values to a byte slice.
 func TypeListBytes(buf []byte, list []Type) int {
 	b := 0
 	var structBytes []byte
diff --git a/nexgb/screensaver/screensaver.go b/nexgb/screensaver/screensaver.go
index a06d8a6..285c3d7 100644
--- a/nexgb/screensaver/screensaver.go
+++ b/nexgb/screensaver/screensaver.go
@@ -2,7 +2,7 @@
 package screensaver
 
 /*
-	This file was generated by screensaver.xml on May 11 2012 11:57:19pm EDT.
+	This file was generated by screensaver.xml on May 26 2012 6:23:13pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,16 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["MIT-SCREEN-SAVER"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Byte'
-
-// Skipping definition for base type 'Int8'
-
-// Skipping definition for base type 'Card16'
-
-// Skipping definition for base type 'Char'
-
-// Skipping definition for base type 'Card32'
-
 // Skipping definition for base type 'Double'
 
 // Skipping definition for base type 'Bool'
@@ -64,6 +54,16 @@ func init() {
 
 // Skipping definition for base type 'Void'
 
+// Skipping definition for base type 'Byte'
+
+// Skipping definition for base type 'Int8'
+
+// Skipping definition for base type 'Card16'
+
+// Skipping definition for base type 'Char'
+
+// Skipping definition for base type 'Card32'
+
 const (
 	KindBlanked  = 0
 	KindInternal = 1
diff --git a/nexgb/shape/shape.go b/nexgb/shape/shape.go
index 83d9020..92ec1fd 100644
--- a/nexgb/shape/shape.go
+++ b/nexgb/shape/shape.go
@@ -2,7 +2,7 @@
 package shape
 
 /*
-	This file was generated by shape.xml on May 11 2012 11:57:19pm EDT.
+	This file was generated by shape.xml on May 26 2012 6:23:13pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,16 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["SHAPE"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Card8'
-
-// Skipping definition for base type 'Int16'
-
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
 // Skipping definition for base type 'Int8'
 
 // Skipping definition for base type 'Card16'
@@ -64,6 +54,16 @@ func init() {
 
 // Skipping definition for base type 'Float'
 
+// Skipping definition for base type 'Card8'
+
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
 const (
 	SoSet       = 0
 	SoUnion     = 1
diff --git a/nexgb/shm/shm.go b/nexgb/shm/shm.go
index ac53579..1bb8408 100644
--- a/nexgb/shm/shm.go
+++ b/nexgb/shm/shm.go
@@ -2,7 +2,7 @@
 package shm
 
 /*
-	This file was generated by shm.xml on May 11 2012 11:57:19pm EDT.
+	This file was generated by shm.xml on May 26 2012 6:23:13pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,18 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["MIT-SHM"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
-// Skipping definition for base type 'Int8'
-
-// Skipping definition for base type 'Card16'
-
-// Skipping definition for base type 'Char'
-
 // Skipping definition for base type 'Card32'
 
 // Skipping definition for base type 'Double'
@@ -64,6 +52,18 @@ func init() {
 
 // Skipping definition for base type 'Int16'
 
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
+// Skipping definition for base type 'Int8'
+
+// Skipping definition for base type 'Card16'
+
+// Skipping definition for base type 'Char'
+
 type Seg uint32
 
 func NewSegId(c *xgb.Conn) (Seg, error) {
diff --git a/nexgb/sync/sync.go b/nexgb/sync/sync.go
index 5aa019e..bc63a45 100644
--- a/nexgb/sync/sync.go
+++ b/nexgb/sync/sync.go
@@ -2,7 +2,7 @@
 package sync
 
 /*
-	This file was generated by sync.xml on May 11 2012 11:57:19pm EDT.
+	This file was generated by sync.xml on May 26 2012 6:23:13pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,6 +40,16 @@ func init() {
 	xgb.NewExtErrorFuncs["SYNC"] = make(map[int]xgb.NewErrorFun)
 }
 
+// Skipping definition for base type 'Card16'
+
+// Skipping definition for base type 'Char'
+
+// Skipping definition for base type 'Card32'
+
+// Skipping definition for base type 'Double'
+
+// Skipping definition for base type 'Bool'
+
 // Skipping definition for base type 'Float'
 
 // Skipping definition for base type 'Card8'
@@ -54,16 +64,6 @@ func init() {
 
 // Skipping definition for base type 'Int8'
 
-// Skipping definition for base type 'Card16'
-
-// Skipping definition for base type 'Char'
-
-// Skipping definition for base type 'Card32'
-
-// Skipping definition for base type 'Double'
-
-// Skipping definition for base type 'Bool'
-
 const (
 	AlarmstateActive    = 0
 	AlarmstateInactive  = 1
@@ -163,7 +163,7 @@ func (v Int64) Bytes() []byte {
 	return buf
 }
 
-// Int64ListBytes writes a list of %s(MISSING) values to a byte slice.
+// Int64ListBytes writes a list of Int64 values to a byte slice.
 func Int64ListBytes(buf []byte, list []Int64) int {
 	b := 0
 	var structBytes []byte
@@ -238,7 +238,7 @@ func (v Systemcounter) Bytes() []byte {
 	return buf
 }
 
-// SystemcounterListBytes writes a list of %s(MISSING) values to a byte slice.
+// SystemcounterListBytes writes a list of Systemcounter values to a byte slice.
 func SystemcounterListBytes(buf []byte, list []Systemcounter) int {
 	b := 0
 	var structBytes []byte
@@ -318,7 +318,7 @@ func (v Trigger) Bytes() []byte {
 	return buf
 }
 
-// TriggerListBytes writes a list of %s(MISSING) values to a byte slice.
+// TriggerListBytes writes a list of Trigger values to a byte slice.
 func TriggerListBytes(buf []byte, list []Trigger) int {
 	b := 0
 	var structBytes []byte
@@ -378,7 +378,7 @@ func (v Waitcondition) Bytes() []byte {
 	return buf
 }
 
-// WaitconditionListBytes writes a list of %s(MISSING) values to a byte slice.
+// WaitconditionListBytes writes a list of Waitcondition values to a byte slice.
 func WaitconditionListBytes(buf []byte, list []Waitcondition) int {
 	b := 0
 	var structBytes []byte
diff --git a/nexgb/xcmisc/xcmisc.go b/nexgb/xcmisc/xcmisc.go
index 0a4b4ce..0ca4094 100644
--- a/nexgb/xcmisc/xcmisc.go
+++ b/nexgb/xcmisc/xcmisc.go
@@ -2,7 +2,7 @@
 package xcmisc
 
 /*
-	This file was generated by xc_misc.xml on May 11 2012 11:57:19pm EDT.
+	This file was generated by xc_misc.xml on May 26 2012 6:23:13pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
diff --git a/nexgb/xevie/xevie.go b/nexgb/xevie/xevie.go
index 0628ffd..ebcd99c 100644
--- a/nexgb/xevie/xevie.go
+++ b/nexgb/xevie/xevie.go
@@ -2,7 +2,7 @@
 package xevie
 
 /*
-	This file was generated by xevie.xml on May 11 2012 11:57:19pm EDT.
+	This file was generated by xevie.xml on May 26 2012 6:23:13pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,6 +40,8 @@ func init() {
 	xgb.NewExtErrorFuncs["XEVIE"] = make(map[int]xgb.NewErrorFun)
 }
 
+// Skipping definition for base type 'Int32'
+
 // Skipping definition for base type 'Void'
 
 // Skipping definition for base type 'Byte'
@@ -62,8 +64,6 @@ func init() {
 
 // Skipping definition for base type 'Int16'
 
-// Skipping definition for base type 'Int32'
-
 const (
 	DatatypeUnmodified = 0
 	DatatypeModified   = 1
@@ -102,7 +102,7 @@ func (v Event) Bytes() []byte {
 	return buf
 }
 
-// EventListBytes writes a list of %s(MISSING) values to a byte slice.
+// EventListBytes writes a list of Event values to a byte slice.
 func EventListBytes(buf []byte, list []Event) int {
 	b := 0
 	var structBytes []byte
diff --git a/nexgb/xf86dri/xf86dri.go b/nexgb/xf86dri/xf86dri.go
index f0224a5..0737f5b 100644
--- a/nexgb/xf86dri/xf86dri.go
+++ b/nexgb/xf86dri/xf86dri.go
@@ -2,7 +2,7 @@
 package xf86dri
 
 /*
-	This file was generated by xf86dri.xml on May 11 2012 11:57:19pm EDT.
+	This file was generated by xf86dri.xml on May 26 2012 6:23:13pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,16 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["XFree86-DRI"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Float'
-
-// Skipping definition for base type 'Card8'
-
-// Skipping definition for base type 'Int16'
-
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
 // Skipping definition for base type 'Byte'
 
 // Skipping definition for base type 'Int8'
@@ -64,6 +54,16 @@ func init() {
 
 // Skipping definition for base type 'Bool'
 
+// Skipping definition for base type 'Float'
+
+// Skipping definition for base type 'Card8'
+
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
 type DrmClipRect struct {
 	X1 int16
 	Y1 int16
@@ -120,7 +120,7 @@ func (v DrmClipRect) Bytes() []byte {
 	return buf
 }
 
-// DrmClipRectListBytes writes a list of %s(MISSING) values to a byte slice.
+// DrmClipRectListBytes writes a list of DrmClipRect values to a byte slice.
 func DrmClipRectListBytes(buf []byte, list []DrmClipRect) int {
 	b := 0
 	var structBytes []byte
diff --git a/nexgb/xf86vidmode/xf86vidmode.go b/nexgb/xf86vidmode/xf86vidmode.go
index be41acd..ae57983 100644
--- a/nexgb/xf86vidmode/xf86vidmode.go
+++ b/nexgb/xf86vidmode/xf86vidmode.go
@@ -2,7 +2,7 @@
 package xf86vidmode
 
 /*
-	This file was generated by xf86vidmode.xml on May 11 2012 11:57:19pm EDT.
+	This file was generated by xf86vidmode.xml on May 26 2012 6:23:13pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,16 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["XFree86-VidModeExtension"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Int8'
-
-// Skipping definition for base type 'Card16'
-
-// Skipping definition for base type 'Char'
-
-// Skipping definition for base type 'Card32'
-
-// Skipping definition for base type 'Double'
-
 // Skipping definition for base type 'Bool'
 
 // Skipping definition for base type 'Float'
@@ -64,6 +54,16 @@ func init() {
 
 // Skipping definition for base type 'Byte'
 
+// Skipping definition for base type 'Int8'
+
+// Skipping definition for base type 'Card16'
+
+// Skipping definition for base type 'Char'
+
+// Skipping definition for base type 'Card32'
+
+// Skipping definition for base type 'Double'
+
 const (
 	ModeFlagPositiveHsync = 1
 	ModeFlagNegativeHsync = 2
@@ -215,7 +215,7 @@ func (v ModeInfo) Bytes() []byte {
 	return buf
 }
 
-// ModeInfoListBytes writes a list of %s(MISSING) values to a byte slice.
+// ModeInfoListBytes writes a list of ModeInfo values to a byte slice.
 func ModeInfoListBytes(buf []byte, list []ModeInfo) int {
 	b := 0
 	var structBytes []byte
diff --git a/nexgb/xfixes/xfixes.go b/nexgb/xfixes/xfixes.go
index 08cb596..daafe7e 100644
--- a/nexgb/xfixes/xfixes.go
+++ b/nexgb/xfixes/xfixes.go
@@ -2,7 +2,7 @@
 package xfixes
 
 /*
-	This file was generated by xfixes.xml on May 11 2012 11:57:20pm EDT.
+	This file was generated by xfixes.xml on May 26 2012 6:23:13pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -42,6 +42,14 @@ func init() {
 	xgb.NewExtErrorFuncs["XFIXES"] = make(map[int]xgb.NewErrorFun)
 }
 
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
 // Skipping definition for base type 'Int8'
 
 // Skipping definition for base type 'Card16'
@@ -58,14 +66,6 @@ func init() {
 
 // Skipping definition for base type 'Card8'
 
-// Skipping definition for base type 'Int16'
-
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
 const (
 	SaveSetModeInsert = 0
 	SaveSetModeDelete = 1
diff --git a/nexgb/xgbgen/go_struct.go b/nexgb/xgbgen/go_struct.go
index a988893..cb765a0 100644
--- a/nexgb/xgbgen/go_struct.go
+++ b/nexgb/xgbgen/go_struct.go
@@ -85,7 +85,7 @@ func (s *Struct) Write(c *Context) {
 
 func (s *Struct) WriteList(c *Context) {
 	c.Putln("// %sListBytes writes a list of %s values to a byte slice.",
-		s.SrcName())
+		s.SrcName(), s.SrcName())
 	c.Putln("func %sListBytes(buf []byte, list []%s) int {",
 		s.SrcName(), s.SrcName())
 	c.Putln("b := 0")
diff --git a/nexgb/xinerama/xinerama.go b/nexgb/xinerama/xinerama.go
index 51b270a..24cba4a 100644
--- a/nexgb/xinerama/xinerama.go
+++ b/nexgb/xinerama/xinerama.go
@@ -2,7 +2,7 @@
 package xinerama
 
 /*
-	This file was generated by xinerama.xml on May 11 2012 11:57:20pm EDT.
+	This file was generated by xinerama.xml on May 26 2012 6:23:14pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,10 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["XINERAMA"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
 // Skipping definition for base type 'Byte'
 
 // Skipping definition for base type 'Int8'
@@ -64,6 +60,10 @@ func init() {
 
 // Skipping definition for base type 'Int16'
 
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
 type ScreenInfo struct {
 	XOrg   int16
 	YOrg   int16
@@ -120,7 +120,7 @@ func (v ScreenInfo) Bytes() []byte {
 	return buf
 }
 
-// ScreenInfoListBytes writes a list of %s(MISSING) values to a byte slice.
+// ScreenInfoListBytes writes a list of ScreenInfo values to a byte slice.
 func ScreenInfoListBytes(buf []byte, list []ScreenInfo) int {
 	b := 0
 	var structBytes []byte
diff --git a/nexgb/xinput/xinput.go b/nexgb/xinput/xinput.go
index 2ed45b8..6144528 100644
--- a/nexgb/xinput/xinput.go
+++ b/nexgb/xinput/xinput.go
@@ -2,7 +2,7 @@
 package xinput
 
 /*
-	This file was generated by xinput.xml on May 11 2012 11:57:20pm EDT.
+	This file was generated by xinput.xml on May 26 2012 6:23:14pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,6 +40,8 @@ func init() {
 	xgb.NewExtErrorFuncs["XInputExtension"] = make(map[int]xgb.NewErrorFun)
 }
 
+// Skipping definition for base type 'Int32'
+
 // Skipping definition for base type 'Void'
 
 // Skipping definition for base type 'Byte'
@@ -62,8 +64,6 @@ func init() {
 
 // Skipping definition for base type 'Int16'
 
-// Skipping definition for base type 'Int32'
-
 const (
 	ValuatorModeRelative = 0
 	ValuatorModeAbsolute = 1
@@ -175,7 +175,7 @@ func (v DeviceInfo) Bytes() []byte {
 	return buf
 }
 
-// DeviceInfoListBytes writes a list of %s(MISSING) values to a byte slice.
+// DeviceInfoListBytes writes a list of DeviceInfo values to a byte slice.
 func DeviceInfoListBytes(buf []byte, list []DeviceInfo) int {
 	b := 0
 	var structBytes []byte
@@ -229,7 +229,7 @@ func (v InputInfo) Bytes() []byte {
 	return buf
 }
 
-// InputInfoListBytes writes a list of %s(MISSING) values to a byte slice.
+// InputInfoListBytes writes a list of InputInfo values to a byte slice.
 func InputInfoListBytes(buf []byte, list []InputInfo) int {
 	b := 0
 	var structBytes []byte
@@ -309,7 +309,7 @@ func (v KeyInfo) Bytes() []byte {
 	return buf
 }
 
-// KeyInfoListBytes writes a list of %s(MISSING) values to a byte slice.
+// KeyInfoListBytes writes a list of KeyInfo values to a byte slice.
 func KeyInfoListBytes(buf []byte, list []KeyInfo) int {
 	b := 0
 	var structBytes []byte
@@ -370,7 +370,7 @@ func (v ButtonInfo) Bytes() []byte {
 	return buf
 }
 
-// ButtonInfoListBytes writes a list of %s(MISSING) values to a byte slice.
+// ButtonInfoListBytes writes a list of ButtonInfo values to a byte slice.
 func ButtonInfoListBytes(buf []byte, list []ButtonInfo) int {
 	b := 0
 	var structBytes []byte
@@ -431,7 +431,7 @@ func (v AxisInfo) Bytes() []byte {
 	return buf
 }
 
-// AxisInfoListBytes writes a list of %s(MISSING) values to a byte slice.
+// AxisInfoListBytes writes a list of AxisInfo values to a byte slice.
 func AxisInfoListBytes(buf []byte, list []AxisInfo) int {
 	b := 0
 	var structBytes []byte
@@ -512,7 +512,7 @@ func (v ValuatorInfo) Bytes() []byte {
 	return buf
 }
 
-// ValuatorInfoListBytes writes a list of %s(MISSING) values to a byte slice.
+// ValuatorInfoListBytes writes a list of ValuatorInfo values to a byte slice.
 func ValuatorInfoListBytes(buf []byte, list []ValuatorInfo) int {
 	b := 0
 	var structBytes []byte
@@ -575,7 +575,7 @@ func (v InputClassInfo) Bytes() []byte {
 	return buf
 }
 
-// InputClassInfoListBytes writes a list of %s(MISSING) values to a byte slice.
+// InputClassInfoListBytes writes a list of InputClassInfo values to a byte slice.
 func InputClassInfoListBytes(buf []byte, list []InputClassInfo) int {
 	b := 0
 	var structBytes []byte
@@ -622,7 +622,7 @@ func (v DeviceTimeCoord) Bytes() []byte {
 	return buf
 }
 
-// DeviceTimeCoordListBytes writes a list of %s(MISSING) values to a byte slice.
+// DeviceTimeCoordListBytes writes a list of DeviceTimeCoord values to a byte slice.
 func DeviceTimeCoordListBytes(buf []byte, list []DeviceTimeCoord) int {
 	b := 0
 	var structBytes []byte
@@ -683,7 +683,7 @@ func (v FeedbackState) Bytes() []byte {
 	return buf
 }
 
-// FeedbackStateListBytes writes a list of %s(MISSING) values to a byte slice.
+// FeedbackStateListBytes writes a list of FeedbackState values to a byte slice.
 func FeedbackStateListBytes(buf []byte, list []FeedbackState) int {
 	b := 0
 	var structBytes []byte
@@ -814,7 +814,7 @@ func (v KbdFeedbackState) Bytes() []byte {
 	return buf
 }
 
-// KbdFeedbackStateListBytes writes a list of %s(MISSING) values to a byte slice.
+// KbdFeedbackStateListBytes writes a list of KbdFeedbackState values to a byte slice.
 func KbdFeedbackStateListBytes(buf []byte, list []KbdFeedbackState) int {
 	b := 0
 	var structBytes []byte
@@ -910,7 +910,7 @@ func (v PtrFeedbackState) Bytes() []byte {
 	return buf
 }
 
-// PtrFeedbackStateListBytes writes a list of %s(MISSING) values to a byte slice.
+// PtrFeedbackStateListBytes writes a list of PtrFeedbackState values to a byte slice.
 func PtrFeedbackStateListBytes(buf []byte, list []PtrFeedbackState) int {
 	b := 0
 	var structBytes []byte
@@ -992,7 +992,7 @@ func (v IntegerFeedbackState) Bytes() []byte {
 	return buf
 }
 
-// IntegerFeedbackStateListBytes writes a list of %s(MISSING) values to a byte slice.
+// IntegerFeedbackStateListBytes writes a list of IntegerFeedbackState values to a byte slice.
 func IntegerFeedbackStateListBytes(buf []byte, list []IntegerFeedbackState) int {
 	b := 0
 	var structBytes []byte
@@ -1081,7 +1081,7 @@ func (v StringFeedbackState) Bytes() []byte {
 	return buf
 }
 
-// StringFeedbackStateListBytes writes a list of %s(MISSING) values to a byte slice.
+// StringFeedbackStateListBytes writes a list of StringFeedbackState values to a byte slice.
 func StringFeedbackStateListBytes(buf []byte, list []StringFeedbackState) int {
 	b := 0
 	var structBytes []byte
@@ -1177,7 +1177,7 @@ func (v BellFeedbackState) Bytes() []byte {
 	return buf
 }
 
-// BellFeedbackStateListBytes writes a list of %s(MISSING) values to a byte slice.
+// BellFeedbackStateListBytes writes a list of BellFeedbackState values to a byte slice.
 func BellFeedbackStateListBytes(buf []byte, list []BellFeedbackState) int {
 	b := 0
 	var structBytes []byte
@@ -1252,7 +1252,7 @@ func (v LedFeedbackState) Bytes() []byte {
 	return buf
 }
 
-// LedFeedbackStateListBytes writes a list of %s(MISSING) values to a byte slice.
+// LedFeedbackStateListBytes writes a list of LedFeedbackState values to a byte slice.
 func LedFeedbackStateListBytes(buf []byte, list []LedFeedbackState) int {
 	b := 0
 	var structBytes []byte
@@ -1313,7 +1313,7 @@ func (v FeedbackCtl) Bytes() []byte {
 	return buf
 }
 
-// FeedbackCtlListBytes writes a list of %s(MISSING) values to a byte slice.
+// FeedbackCtlListBytes writes a list of FeedbackCtl values to a byte slice.
 func FeedbackCtlListBytes(buf []byte, list []FeedbackCtl) int {
 	b := 0
 	var structBytes []byte
@@ -1430,7 +1430,7 @@ func (v KbdFeedbackCtl) Bytes() []byte {
 	return buf
 }
 
-// KbdFeedbackCtlListBytes writes a list of %s(MISSING) values to a byte slice.
+// KbdFeedbackCtlListBytes writes a list of KbdFeedbackCtl values to a byte slice.
 func KbdFeedbackCtlListBytes(buf []byte, list []KbdFeedbackCtl) int {
 	b := 0
 	var structBytes []byte
@@ -1517,7 +1517,7 @@ func (v PtrFeedbackCtl) Bytes() []byte {
 	return buf
 }
 
-// PtrFeedbackCtlListBytes writes a list of %s(MISSING) values to a byte slice.
+// PtrFeedbackCtlListBytes writes a list of PtrFeedbackCtl values to a byte slice.
 func PtrFeedbackCtlListBytes(buf []byte, list []PtrFeedbackCtl) int {
 	b := 0
 	var structBytes []byte
@@ -1585,7 +1585,7 @@ func (v IntegerFeedbackCtl) Bytes() []byte {
 	return buf
 }
 
-// IntegerFeedbackCtlListBytes writes a list of %s(MISSING) values to a byte slice.
+// IntegerFeedbackCtlListBytes writes a list of IntegerFeedbackCtl values to a byte slice.
 func IntegerFeedbackCtlListBytes(buf []byte, list []IntegerFeedbackCtl) int {
 	b := 0
 	var structBytes []byte
@@ -1672,7 +1672,7 @@ func (v StringFeedbackCtl) Bytes() []byte {
 	return buf
 }
 
-// StringFeedbackCtlListBytes writes a list of %s(MISSING) values to a byte slice.
+// StringFeedbackCtlListBytes writes a list of StringFeedbackCtl values to a byte slice.
 func StringFeedbackCtlListBytes(buf []byte, list []StringFeedbackCtl) int {
 	b := 0
 	var structBytes []byte
@@ -1768,7 +1768,7 @@ func (v BellFeedbackCtl) Bytes() []byte {
 	return buf
 }
 
-// BellFeedbackCtlListBytes writes a list of %s(MISSING) values to a byte slice.
+// BellFeedbackCtlListBytes writes a list of BellFeedbackCtl values to a byte slice.
 func BellFeedbackCtlListBytes(buf []byte, list []BellFeedbackCtl) int {
 	b := 0
 	var structBytes []byte
@@ -1843,7 +1843,7 @@ func (v LedFeedbackCtl) Bytes() []byte {
 	return buf
 }
 
-// LedFeedbackCtlListBytes writes a list of %s(MISSING) values to a byte slice.
+// LedFeedbackCtlListBytes writes a list of LedFeedbackCtl values to a byte slice.
 func LedFeedbackCtlListBytes(buf []byte, list []LedFeedbackCtl) int {
 	b := 0
 	var structBytes []byte
@@ -1904,7 +1904,7 @@ func (v InputState) Bytes() []byte {
 	return buf
 }
 
-// InputStateListBytes writes a list of %s(MISSING) values to a byte slice.
+// InputStateListBytes writes a list of InputState values to a byte slice.
 func InputStateListBytes(buf []byte, list []InputState) int {
 	b := 0
 	var structBytes []byte
@@ -1978,7 +1978,7 @@ func (v KeyState) Bytes() []byte {
 	return buf
 }
 
-// KeyStateListBytes writes a list of %s(MISSING) values to a byte slice.
+// KeyStateListBytes writes a list of KeyState values to a byte slice.
 func KeyStateListBytes(buf []byte, list []KeyState) int {
 	b := 0
 	var structBytes []byte
@@ -2061,7 +2061,7 @@ func (v ButtonState) Bytes() []byte {
 	return buf
 }
 
-// ButtonStateListBytes writes a list of %s(MISSING) values to a byte slice.
+// ButtonStateListBytes writes a list of ButtonState values to a byte slice.
 func ButtonStateListBytes(buf []byte, list []ButtonState) int {
 	b := 0
 	var structBytes []byte
@@ -2152,7 +2152,7 @@ func (v ValuatorState) Bytes() []byte {
 	return buf
 }
 
-// ValuatorStateListBytes writes a list of %s(MISSING) values to a byte slice.
+// ValuatorStateListBytes writes a list of ValuatorState values to a byte slice.
 func ValuatorStateListBytes(buf []byte, list []ValuatorState) int {
 	b := 0
 	var structBytes []byte
@@ -2215,7 +2215,7 @@ func (v DeviceState) Bytes() []byte {
 	return buf
 }
 
-// DeviceStateListBytes writes a list of %s(MISSING) values to a byte slice.
+// DeviceStateListBytes writes a list of DeviceState values to a byte slice.
 func DeviceStateListBytes(buf []byte, list []DeviceState) int {
 	b := 0
 	var structBytes []byte
@@ -2318,7 +2318,7 @@ func (v DeviceResolutionState) Bytes() []byte {
 	return buf
 }
 
-// DeviceResolutionStateListBytes writes a list of %s(MISSING) values to a byte slice.
+// DeviceResolutionStateListBytes writes a list of DeviceResolutionState values to a byte slice.
 func DeviceResolutionStateListBytes(buf []byte, list []DeviceResolutionState) int {
 	b := 0
 	var structBytes []byte
@@ -2437,7 +2437,7 @@ func (v DeviceAbsCalibState) Bytes() []byte {
 	return buf
 }
 
-// DeviceAbsCalibStateListBytes writes a list of %s(MISSING) values to a byte slice.
+// DeviceAbsCalibStateListBytes writes a list of DeviceAbsCalibState values to a byte slice.
 func DeviceAbsCalibStateListBytes(buf []byte, list []DeviceAbsCalibState) int {
 	b := 0
 	var structBytes []byte
@@ -2533,7 +2533,7 @@ func (v DeviceAbsAreaState) Bytes() []byte {
 	return buf
 }
 
-// DeviceAbsAreaStateListBytes writes a list of %s(MISSING) values to a byte slice.
+// DeviceAbsAreaStateListBytes writes a list of DeviceAbsAreaState values to a byte slice.
 func DeviceAbsAreaStateListBytes(buf []byte, list []DeviceAbsAreaState) int {
 	b := 0
 	var structBytes []byte
@@ -2606,7 +2606,7 @@ func (v DeviceCoreState) Bytes() []byte {
 	return buf
 }
 
-// DeviceCoreStateListBytes writes a list of %s(MISSING) values to a byte slice.
+// DeviceCoreStateListBytes writes a list of DeviceCoreState values to a byte slice.
 func DeviceCoreStateListBytes(buf []byte, list []DeviceCoreState) int {
 	b := 0
 	var structBytes []byte
@@ -2672,7 +2672,7 @@ func (v DeviceEnableState) Bytes() []byte {
 	return buf
 }
 
-// DeviceEnableStateListBytes writes a list of %s(MISSING) values to a byte slice.
+// DeviceEnableStateListBytes writes a list of DeviceEnableState values to a byte slice.
 func DeviceEnableStateListBytes(buf []byte, list []DeviceEnableState) int {
 	b := 0
 	var structBytes []byte
@@ -2726,7 +2726,7 @@ func (v DeviceCtl) Bytes() []byte {
 	return buf
 }
 
-// DeviceCtlListBytes writes a list of %s(MISSING) values to a byte slice.
+// DeviceCtlListBytes writes a list of DeviceCtl values to a byte slice.
 func DeviceCtlListBytes(buf []byte, list []DeviceCtl) int {
 	b := 0
 	var structBytes []byte
@@ -2808,7 +2808,7 @@ func (v DeviceResolutionCtl) Bytes() []byte {
 	return buf
 }
 
-// DeviceResolutionCtlListBytes writes a list of %s(MISSING) values to a byte slice.
+// DeviceResolutionCtlListBytes writes a list of DeviceResolutionCtl values to a byte slice.
 func DeviceResolutionCtlListBytes(buf []byte, list []DeviceResolutionCtl) int {
 	b := 0
 	var structBytes []byte
@@ -2927,7 +2927,7 @@ func (v DeviceAbsCalibCtl) Bytes() []byte {
 	return buf
 }
 
-// DeviceAbsCalibCtlListBytes writes a list of %s(MISSING) values to a byte slice.
+// DeviceAbsCalibCtlListBytes writes a list of DeviceAbsCalibCtl values to a byte slice.
 func DeviceAbsCalibCtlListBytes(buf []byte, list []DeviceAbsCalibCtl) int {
 	b := 0
 	var structBytes []byte
@@ -3023,7 +3023,7 @@ func (v DeviceAbsAreaCtrl) Bytes() []byte {
 	return buf
 }
 
-// DeviceAbsAreaCtrlListBytes writes a list of %s(MISSING) values to a byte slice.
+// DeviceAbsAreaCtrlListBytes writes a list of DeviceAbsAreaCtrl values to a byte slice.
 func DeviceAbsAreaCtrlListBytes(buf []byte, list []DeviceAbsAreaCtrl) int {
 	b := 0
 	var structBytes []byte
@@ -3089,7 +3089,7 @@ func (v DeviceCoreCtrl) Bytes() []byte {
 	return buf
 }
 
-// DeviceCoreCtrlListBytes writes a list of %s(MISSING) values to a byte slice.
+// DeviceCoreCtrlListBytes writes a list of DeviceCoreCtrl values to a byte slice.
 func DeviceCoreCtrlListBytes(buf []byte, list []DeviceCoreCtrl) int {
 	b := 0
 	var structBytes []byte
@@ -3155,7 +3155,7 @@ func (v DeviceEnableCtrl) Bytes() []byte {
 	return buf
 }
 
-// DeviceEnableCtrlListBytes writes a list of %s(MISSING) values to a byte slice.
+// DeviceEnableCtrlListBytes writes a list of DeviceEnableCtrl values to a byte slice.
 func DeviceEnableCtrlListBytes(buf []byte, list []DeviceEnableCtrl) int {
 	b := 0
 	var structBytes []byte
diff --git a/nexgb/xprint/xprint.go b/nexgb/xprint/xprint.go
index 8e6f470..a7a537a 100644
--- a/nexgb/xprint/xprint.go
+++ b/nexgb/xprint/xprint.go
@@ -2,7 +2,7 @@
 package xprint
 
 /*
-	This file was generated by xprint.xml on May 11 2012 11:57:20pm EDT.
+	This file was generated by xprint.xml on May 26 2012 6:23:14pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,16 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["XpExtension"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Char'
-
-// Skipping definition for base type 'Card32'
-
-// Skipping definition for base type 'Double'
-
-// Skipping definition for base type 'Bool'
-
-// Skipping definition for base type 'Float'
-
 // Skipping definition for base type 'Card8'
 
 // Skipping definition for base type 'Int16'
@@ -64,6 +54,16 @@ func init() {
 
 // Skipping definition for base type 'Card16'
 
+// Skipping definition for base type 'Char'
+
+// Skipping definition for base type 'Card32'
+
+// Skipping definition for base type 'Double'
+
+// Skipping definition for base type 'Bool'
+
+// Skipping definition for base type 'Float'
+
 const (
 	GetDocFinished       = 0
 	GetDocSecondConsumer = 1
@@ -176,7 +176,7 @@ func (v Printer) Bytes() []byte {
 	return buf
 }
 
-// PrinterListBytes writes a list of %s(MISSING) values to a byte slice.
+// PrinterListBytes writes a list of Printer values to a byte slice.
 func PrinterListBytes(buf []byte, list []Printer) int {
 	b := 0
 	var structBytes []byte
diff --git a/nexgb/xproto/xproto.go b/nexgb/xproto/xproto.go
index f19e99e..3ee3850 100644
--- a/nexgb/xproto/xproto.go
+++ b/nexgb/xproto/xproto.go
@@ -2,7 +2,7 @@
 package xproto
 
 /*
-	This file was generated by xproto.xml on May 11 2012 11:57:20pm EDT.
+	This file was generated by xproto.xml on May 26 2012 6:23:14pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -23,6 +23,16 @@ func (s *SetupInfo) DefaultScreen(c *xgb.Conn) *ScreenInfo {
 	return &s.Roots[c.DefaultScreen]
 }
 
+// Skipping definition for base type 'Card8'
+
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
 // Skipping definition for base type 'Int8'
 
 // Skipping definition for base type 'Card16'
@@ -37,16 +47,6 @@ func (s *SetupInfo) DefaultScreen(c *xgb.Conn) *ScreenInfo {
 
 // Skipping definition for base type 'Float'
 
-// Skipping definition for base type 'Card8'
-
-// Skipping definition for base type 'Int16'
-
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
 const (
 	VisualClassStaticGray  = 0
 	VisualClassGrayScale   = 1
@@ -775,7 +775,7 @@ func (v Char2b) Bytes() []byte {
 	return buf
 }
 
-// Char2bListBytes writes a list of %s(MISSING) values to a byte slice.
+// Char2bListBytes writes a list of Char2b values to a byte slice.
 func Char2bListBytes(buf []byte, list []Char2b) int {
 	b := 0
 	var structBytes []byte
@@ -829,7 +829,7 @@ func (v Point) Bytes() []byte {
 	return buf
 }
 
-// PointListBytes writes a list of %s(MISSING) values to a byte slice.
+// PointListBytes writes a list of Point values to a byte slice.
 func PointListBytes(buf []byte, list []Point) int {
 	b := 0
 	var structBytes []byte
@@ -897,7 +897,7 @@ func (v Rectangle) Bytes() []byte {
 	return buf
 }
 
-// RectangleListBytes writes a list of %s(MISSING) values to a byte slice.
+// RectangleListBytes writes a list of Rectangle values to a byte slice.
 func RectangleListBytes(buf []byte, list []Rectangle) int {
 	b := 0
 	var structBytes []byte
@@ -979,7 +979,7 @@ func (v Arc) Bytes() []byte {
 	return buf
 }
 
-// ArcListBytes writes a list of %s(MISSING) values to a byte slice.
+// ArcListBytes writes a list of Arc values to a byte slice.
 func ArcListBytes(buf []byte, list []Arc) int {
 	b := 0
 	var structBytes []byte
@@ -1045,7 +1045,7 @@ func (v Format) Bytes() []byte {
 	return buf
 }
 
-// FormatListBytes writes a list of %s(MISSING) values to a byte slice.
+// FormatListBytes writes a list of Format values to a byte slice.
 func FormatListBytes(buf []byte, list []Format) int {
 	b := 0
 	var structBytes []byte
@@ -1139,7 +1139,7 @@ func (v VisualInfo) Bytes() []byte {
 	return buf
 }
 
-// VisualInfoListBytes writes a list of %s(MISSING) values to a byte slice.
+// VisualInfoListBytes writes a list of VisualInfo values to a byte slice.
 func VisualInfoListBytes(buf []byte, list []VisualInfo) int {
 	b := 0
 	var structBytes []byte
@@ -1209,7 +1209,7 @@ func (v DepthInfo) Bytes() []byte {
 	return buf
 }
 
-// DepthInfoListBytes writes a list of %s(MISSING) values to a byte slice.
+// DepthInfoListBytes writes a list of DepthInfo values to a byte slice.
 func DepthInfoListBytes(buf []byte, list []DepthInfo) int {
 	b := 0
 	var structBytes []byte
@@ -1384,7 +1384,7 @@ func (v ScreenInfo) Bytes() []byte {
 	return buf
 }
 
-// ScreenInfoListBytes writes a list of %s(MISSING) values to a byte slice.
+// ScreenInfoListBytes writes a list of ScreenInfo values to a byte slice.
 func ScreenInfoListBytes(buf []byte, list []ScreenInfo) int {
 	b := 0
 	var structBytes []byte
@@ -1500,7 +1500,7 @@ func (v SetupRequest) Bytes() []byte {
 	return buf
 }
 
-// SetupRequestListBytes writes a list of %s(MISSING) values to a byte slice.
+// SetupRequestListBytes writes a list of SetupRequest values to a byte slice.
 func SetupRequestListBytes(buf []byte, list []SetupRequest) int {
 	b := 0
 	var structBytes []byte
@@ -1595,7 +1595,7 @@ func (v SetupFailed) Bytes() []byte {
 	return buf
 }
 
-// SetupFailedListBytes writes a list of %s(MISSING) values to a byte slice.
+// SetupFailedListBytes writes a list of SetupFailed values to a byte slice.
 func SetupFailedListBytes(buf []byte, list []SetupFailed) int {
 	b := 0
 	var structBytes []byte
@@ -1674,7 +1674,7 @@ func (v SetupAuthenticate) Bytes() []byte {
 	return buf
 }
 
-// SetupAuthenticateListBytes writes a list of %s(MISSING) values to a byte slice.
+// SetupAuthenticateListBytes writes a list of SetupAuthenticate values to a byte slice.
 func SetupAuthenticateListBytes(buf []byte, list []SetupAuthenticate) int {
 	b := 0
 	var structBytes []byte
@@ -1882,7 +1882,7 @@ func (v SetupInfo) Bytes() []byte {
 	return buf
 }
 
-// SetupInfoListBytes writes a list of %s(MISSING) values to a byte slice.
+// SetupInfoListBytes writes a list of SetupInfo values to a byte slice.
 func SetupInfoListBytes(buf []byte, list []SetupInfo) int {
 	b := 0
 	var structBytes []byte
@@ -1952,7 +1952,7 @@ func (v Timecoord) Bytes() []byte {
 	return buf
 }
 
-// TimecoordListBytes writes a list of %s(MISSING) values to a byte slice.
+// TimecoordListBytes writes a list of Timecoord values to a byte slice.
 func TimecoordListBytes(buf []byte, list []Timecoord) int {
 	b := 0
 	var structBytes []byte
@@ -2006,7 +2006,7 @@ func (v Fontprop) Bytes() []byte {
 	return buf
 }
 
-// FontpropListBytes writes a list of %s(MISSING) values to a byte slice.
+// FontpropListBytes writes a list of Fontprop values to a byte slice.
 func FontpropListBytes(buf []byte, list []Fontprop) int {
 	b := 0
 	var structBytes []byte
@@ -2088,7 +2088,7 @@ func (v Charinfo) Bytes() []byte {
 	return buf
 }
 
-// CharinfoListBytes writes a list of %s(MISSING) values to a byte slice.
+// CharinfoListBytes writes a list of Charinfo values to a byte slice.
 func CharinfoListBytes(buf []byte, list []Charinfo) int {
 	b := 0
 	var structBytes []byte
@@ -2146,7 +2146,7 @@ func (v Str) Bytes() []byte {
 	return buf
 }
 
-// StrListBytes writes a list of %s(MISSING) values to a byte slice.
+// StrListBytes writes a list of Str values to a byte slice.
 func StrListBytes(buf []byte, list []Str) int {
 	b := 0
 	var structBytes []byte
@@ -2223,7 +2223,7 @@ func (v Segment) Bytes() []byte {
 	return buf
 }
 
-// SegmentListBytes writes a list of %s(MISSING) values to a byte slice.
+// SegmentListBytes writes a list of Segment values to a byte slice.
 func SegmentListBytes(buf []byte, list []Segment) int {
 	b := 0
 	var structBytes []byte
@@ -2303,7 +2303,7 @@ func (v Coloritem) Bytes() []byte {
 	return buf
 }
 
-// ColoritemListBytes writes a list of %s(MISSING) values to a byte slice.
+// ColoritemListBytes writes a list of Coloritem values to a byte slice.
 func ColoritemListBytes(buf []byte, list []Coloritem) int {
 	b := 0
 	var structBytes []byte
@@ -2369,7 +2369,7 @@ func (v Rgb) Bytes() []byte {
 	return buf
 }
 
-// RgbListBytes writes a list of %s(MISSING) values to a byte slice.
+// RgbListBytes writes a list of Rgb values to a byte slice.
 func RgbListBytes(buf []byte, list []Rgb) int {
 	b := 0
 	var structBytes []byte
@@ -2436,7 +2436,7 @@ func (v Host) Bytes() []byte {
 	return buf
 }
 
-// HostListBytes writes a list of %s(MISSING) values to a byte slice.
+// HostListBytes writes a list of Host values to a byte slice.
 func HostListBytes(buf []byte, list []Host) int {
 	b := 0
 	var structBytes []byte
diff --git a/nexgb/xselinux/xselinux.go b/nexgb/xselinux/xselinux.go
index 115feb7..5f31984 100644
--- a/nexgb/xselinux/xselinux.go
+++ b/nexgb/xselinux/xselinux.go
@@ -2,7 +2,7 @@
 package xselinux
 
 /*
-	This file was generated by xselinux.xml on May 11 2012 11:57:20pm EDT.
+	This file was generated by xselinux.xml on May 26 2012 6:23:14pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,16 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["SELinux"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
-// Skipping definition for base type 'Int8'
-
-// Skipping definition for base type 'Card16'
-
 // Skipping definition for base type 'Char'
 
 // Skipping definition for base type 'Card32'
@@ -64,6 +54,16 @@ func init() {
 
 // Skipping definition for base type 'Int16'
 
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
+// Skipping definition for base type 'Int8'
+
+// Skipping definition for base type 'Card16'
+
 type ListItem struct {
 	Name             xproto.Atom
 	ObjectContextLen uint32
@@ -135,7 +135,7 @@ func (v ListItem) Bytes() []byte {
 	return buf
 }
 
-// ListItemListBytes writes a list of %s(MISSING) values to a byte slice.
+// ListItemListBytes writes a list of ListItem values to a byte slice.
 func ListItemListBytes(buf []byte, list []ListItem) int {
 	b := 0
 	var structBytes []byte
diff --git a/nexgb/xtest/xtest.go b/nexgb/xtest/xtest.go
index 3fab056..3612649 100644
--- a/nexgb/xtest/xtest.go
+++ b/nexgb/xtest/xtest.go
@@ -2,7 +2,7 @@
 package xtest
 
 /*
-	This file was generated by xtest.xml on May 11 2012 11:57:20pm EDT.
+	This file was generated by xtest.xml on May 26 2012 6:23:14pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -40,12 +40,6 @@ func init() {
 	xgb.NewExtErrorFuncs["XTEST"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
 // Skipping definition for base type 'Int8'
 
 // Skipping definition for base type 'Card16'
@@ -64,6 +58,12 @@ func init() {
 
 // Skipping definition for base type 'Int16'
 
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
 const (
 	CursorNone    = 0
 	CursorCurrent = 1
diff --git a/nexgb/xv/xv.go b/nexgb/xv/xv.go
index c6ba384..c3deb75 100644
--- a/nexgb/xv/xv.go
+++ b/nexgb/xv/xv.go
@@ -2,7 +2,7 @@
 package xv
 
 /*
-	This file was generated by xv.xml on May 11 2012 11:57:20pm EDT.
+	This file was generated by xv.xml on May 26 2012 6:23:14pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -41,14 +41,6 @@ func init() {
 	xgb.NewExtErrorFuncs["XVideo"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Float'
-
-// Skipping definition for base type 'Card8'
-
-// Skipping definition for base type 'Int16'
-
-// Skipping definition for base type 'Int32'
-
 // Skipping definition for base type 'Void'
 
 // Skipping definition for base type 'Byte'
@@ -65,6 +57,14 @@ func init() {
 
 // Skipping definition for base type 'Bool'
 
+// Skipping definition for base type 'Float'
+
+// Skipping definition for base type 'Card8'
+
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
 const (
 	TypeInputMask  = 1
 	TypeOutputMask = 2
@@ -172,7 +172,7 @@ func (v Rational) Bytes() []byte {
 	return buf
 }
 
-// RationalListBytes writes a list of %s(MISSING) values to a byte slice.
+// RationalListBytes writes a list of Rational values to a byte slice.
 func RationalListBytes(buf []byte, list []Rational) int {
 	b := 0
 	var structBytes []byte
@@ -231,7 +231,7 @@ func (v Format) Bytes() []byte {
 	return buf
 }
 
-// FormatListBytes writes a list of %s(MISSING) values to a byte slice.
+// FormatListBytes writes a list of Format values to a byte slice.
 func FormatListBytes(buf []byte, list []Format) int {
 	b := 0
 	var structBytes []byte
@@ -328,7 +328,7 @@ func (v AdaptorInfo) Bytes() []byte {
 	return buf
 }
 
-// AdaptorInfoListBytes writes a list of %s(MISSING) values to a byte slice.
+// AdaptorInfoListBytes writes a list of AdaptorInfo values to a byte slice.
 func AdaptorInfoListBytes(buf []byte, list []AdaptorInfo) int {
 	b := 0
 	var structBytes []byte
@@ -431,7 +431,7 @@ func (v EncodingInfo) Bytes() []byte {
 	return buf
 }
 
-// EncodingInfoListBytes writes a list of %s(MISSING) values to a byte slice.
+// EncodingInfoListBytes writes a list of EncodingInfo values to a byte slice.
 func EncodingInfoListBytes(buf []byte, list []EncodingInfo) int {
 	b := 0
 	var structBytes []byte
@@ -551,7 +551,7 @@ func (v Image) Bytes() []byte {
 	return buf
 }
 
-// ImageListBytes writes a list of %s(MISSING) values to a byte slice.
+// ImageListBytes writes a list of Image values to a byte slice.
 func ImageListBytes(buf []byte, list []Image) int {
 	b := 0
 	var structBytes []byte
@@ -639,7 +639,7 @@ func (v AttributeInfo) Bytes() []byte {
 	return buf
 }
 
-// AttributeInfoListBytes writes a list of %s(MISSING) values to a byte slice.
+// AttributeInfoListBytes writes a list of AttributeInfo values to a byte slice.
 func AttributeInfoListBytes(buf []byte, list []AttributeInfo) int {
 	b := 0
 	var structBytes []byte
@@ -869,7 +869,7 @@ func (v ImageFormatInfo) Bytes() []byte {
 	return buf
 }
 
-// ImageFormatInfoListBytes writes a list of %s(MISSING) values to a byte slice.
+// ImageFormatInfoListBytes writes a list of ImageFormatInfo values to a byte slice.
 func ImageFormatInfoListBytes(buf []byte, list []ImageFormatInfo) int {
 	b := 0
 	var structBytes []byte
diff --git a/nexgb/xvmc/xvmc.go b/nexgb/xvmc/xvmc.go
index 19b1c83..dc6a950 100644
--- a/nexgb/xvmc/xvmc.go
+++ b/nexgb/xvmc/xvmc.go
@@ -2,7 +2,7 @@
 package xvmc
 
 /*
-	This file was generated by xvmc.xml on May 11 2012 11:57:20pm EDT.
+	This file was generated by xvmc.xml on May 26 2012 6:23:14pm EDT.
 	This file is automatically generated. Edit at your peril!
 */
 
@@ -41,16 +41,6 @@ func init() {
 	xgb.NewExtErrorFuncs["XVideo-MotionCompensation"] = make(map[int]xgb.NewErrorFun)
 }
 
-// Skipping definition for base type 'Card8'
-
-// Skipping definition for base type 'Int16'
-
-// Skipping definition for base type 'Int32'
-
-// Skipping definition for base type 'Void'
-
-// Skipping definition for base type 'Byte'
-
 // Skipping definition for base type 'Int8'
 
 // Skipping definition for base type 'Card16'
@@ -65,6 +55,16 @@ func init() {
 
 // Skipping definition for base type 'Float'
 
+// Skipping definition for base type 'Card8'
+
+// Skipping definition for base type 'Int16'
+
+// Skipping definition for base type 'Int32'
+
+// Skipping definition for base type 'Void'
+
+// Skipping definition for base type 'Byte'
+
 type Context uint32
 
 func NewContextId(c *xgb.Conn) (Context, error) {
@@ -186,7 +186,7 @@ func (v SurfaceInfo) Bytes() []byte {
 	return buf
 }
 
-// SurfaceInfoListBytes writes a list of %s(MISSING) values to a byte slice.
+// SurfaceInfoListBytes writes a list of SurfaceInfo values to a byte slice.
 func SurfaceInfoListBytes(buf []byte, list []SurfaceInfo) int {
 	b := 0
 	var structBytes []byte