diff --git a/moo/marshals.list b/moo/marshals.list
index 4707e7d6..be8850f1 100644
--- a/moo/marshals.list
+++ b/moo/marshals.list
@@ -1,60 +1,40 @@
+BOOL:BOXED
+BOOL:BOXED,STRING
+BOOL:ENUM,INT,BOOLEAN
+BOOL:INT
+BOOL:OBJECT,BOOLEAN
+BOOL:OBJECT,BOXED
+BOOL:OBJECT,BOXED,BOXED
+BOOL:OBJECT,OBJECT
 BOOL:STRING
+BOOL:STRING,OBJECT,OBJECT,INT,INT,POINTER,UINT,UINT
+BOOL:STRING,OBJECT,OBJECT,INT,INT,UINT
+BOOL:STRING,POINTER
 BOOL:VOID
 ENUM:VOID
 INT:VOID
-OBJECT:VOID
-VOID:BOXED,UINT
-VOID:POINTER
-VOID:STRING
-VOID:VOID
-BOOL:BOXED
-BOOL:BOXED,STRING
-BOOL:INT
-BOOL:OBJECT,BOOLEAN
-BOOL:STRING
-BOOL:VOID
 OBJECT:OBJECT
+OBJECT:VOID
+POINTER:VOID
 VOID:BOOLEAN
 VOID:BOXED
 VOID:BOXED,BOXED
+VOID:BOXED,OBJECT
+VOID:BOXED,POINTER
+VOID:BOXED,UINT
 VOID:INT
 VOID:OBJECT
+VOID:OBJECT,BOOL
 VOID:OBJECT,BOXED
+VOID:OBJECT,BOXED,BOXED
 VOID:OBJECT,OBJECT
+VOID:POINTER
+VOID:POINTER,BOOLEAN
+VOID:POINTER,OBJECT
+VOID:POINTER,POINTER
 VOID:STRING
 VOID:STRING,BOXED
 VOID:STRING,OBJECT
 VOID:UINT
 VOID:UINT,POINTER
 VOID:VOID
-BOOL:ENUM,INT,BOOLEAN
-BOOL:OBJECT,BOXED
-BOOL:STRING,OBJECT,OBJECT,INT,INT,POINTER,UINT,UINT
-BOOL:STRING,OBJECT,OBJECT,INT,INT,UINT
-BOOL:STRING,POINTER
-VOID:BOXED
-VOID:BOXED,OBJECT
-VOID:OBJECT,OBJECT
-VOID:POINTER
-VOID:POINTER,OBJECT
-VOID:STRING
-VOID:VOID
-BOOL:BOXED
-BOOL:INT
-BOOL:OBJECT,BOXED
-BOOL:OBJECT,BOXED,BOXED
-BOOL:OBJECT,OBJECT
-BOOL:STRING
-BOOL:VOID
-VOID:BOXED,POINTER
-VOID:INT
-VOID:OBJECT
-VOID:OBJECT,BOOL
-VOID:OBJECT,BOXED,BOXED
-VOID:POINTER
-VOID:POINTER,BOOLEAN
-VOID:POINTER,POINTER
-VOID:STRING
-VOID:UINT
-VOID:VOID
-POINTER:VOID