diff --git a/xext.vapi b/xext.vapi
index f78de6a..8fb09e8 100644
--- a/xext.vapi
+++ b/xext.vapi
@@ -42,10 +42,13 @@ namespace X {
     public ulong nitems;
   }
   [CCode (cname = "XGetTextProperty")]
-  public int get_text_property (Display dpy, Window window, out TextProperty text_prop_return, Atom property);
+  public int get_text_property (Display dpy,
+    Window window, out TextProperty text_prop_return, Atom property);
 
   [CCode (cname = "XmbTextPropertyToTextList")]
-  public int mb_text_property_to_text_list (Display dpy, ref TextProperty text_prop, [CCode (type = "char ***")] out uint8 **list_return, out int count_return);
+  public int mb_text_property_to_text_list (Display dpy,
+    ref TextProperty text_prop,
+    [CCode (type = "char ***")] out uint8 **list_return, out int count_return);
   [CCode (cname = "XFreeStringList")]
   public void free_string_list ([CCode (type = "char **")] uint8** list);
 }
@@ -135,9 +138,11 @@ namespace X {
     public int value_high32 (Value value);
 
     [CCode (cname = "XSyncValueAdd")]
-    public void value_add (out Value result, Value a, Value b, out int poverflow);
+    public void value_add
+      (out Value result, Value a, Value b, out int poverflow);
     [CCode (cname = "XSyncValueSubtract")]
-    public void value_subtract (out Value result, Value a, Value b, out int poverflow);
+    public void value_subtract
+      (out Value result, Value a, Value b, out int poverflow);
 
     [CCode (cname = "XSyncMaxValue")]
     public void max_value (out Value pv);
@@ -186,15 +191,15 @@ namespace X {
       public AlarmState state;
     }
 
-    // TODO: XSyncAlarmError
-    // TODO: XSyncCounterError
-
     [CCode (cname = "XSyncQueryExtension")]
-    public X.Status query_extension (X.Display dpy, out int event_base, out int error_base);
+    public X.Status query_extension (X.Display dpy,
+      out int event_base, out int error_base);
     [CCode (cname = "XSyncInitialize")]
-    public X.Status initialize (X.Display dpy, out int major_version, out int minor_version);
+    public X.Status initialize (X.Display dpy,
+      out int major_version, out int minor_version);
     [CCode (cname = "XSyncListSystemCounters")]
-    public SystemCounter *list_system_counters (X.Display dpy, out int n_counters);
+    public SystemCounter *list_system_counters (X.Display dpy,
+      out int n_counters);
     [CCode (cname = "XSyncFreeSystemCounterList")]
     public void free_system_counter_list (SystemCounter *counters);
 
@@ -207,19 +212,24 @@ namespace X {
     [CCode (cname = "XSyncDestroyCounter")]
     public X.Status destroy_counter (X.Display dpy, X.ID counter);
     [CCode (cname = "XSyncQueryCounter")]
-    public X.Status query_counter (X.Display dpy, X.ID counter, out Value value);
+    public X.Status query_counter (X.Display dpy,
+      X.ID counter, out Value value);
 
     [CCode (cname = "XSyncAwait")]
-    public X.Status await (X.Display dpy, WaitCondition *wait_list, int n_conditions);
+    public X.Status await (X.Display dpy,
+      WaitCondition *wait_list, int n_conditions);
 
     [CCode (cname = "XSyncCreateAlarm")]
-    public X.ID create_alarm (X.Display dpy, CA values_mask, ref AlarmAttributes values);
+    public X.ID create_alarm (X.Display dpy,
+      CA values_mask, ref AlarmAttributes values);
     [CCode (cname = "XSyncDestroyAlarm")]
     public X.Status destroy_alarm (X.Display dpy, X.ID alarm);
     [CCode (cname = "XSyncQueryAlarm")]
-    public X.Status query_alarm (X.Display dpy, X.ID alarm, out AlarmAttributes values_return);
+    public X.Status query_alarm (X.Display dpy,
+      X.ID alarm, out AlarmAttributes values_return);
     [CCode (cname = "XSyncChangeAlarm")]
-    public X.Status change_alarm (X.Display dpy, X.ID alarm, CA values_mask, ref AlarmAttributes values);
+    public X.Status change_alarm (X.Display dpy,
+      X.ID alarm, CA values_mask, ref AlarmAttributes values);
 
     [CCode (cname = "XSyncSetPriority")]
     public X.Status set_priority (X.Display dpy, X.ID alarm, int priority);
@@ -227,7 +237,8 @@ namespace X {
     public X.Status get_priority (X.Display dpy, X.ID alarm, out int priority);
 
     [CCode (cname = "XSyncCreateFence")]
-    public X.ID create_fence (X.Display dpy, X.Drawable d, int initially_triggered);
+    public X.ID create_fence (X.Display dpy,
+      X.Drawable d, int initially_triggered);
     [CCode (cname = "XSyncTriggerFence")]
     public int trigger_fence (X.Display dpy, X.ID fence);
     [CCode (cname = "XSyncResetFence")]