diff --git a/include/with99.h b/include/with99.h
index 1573f96..f9c19c3 100644
--- a/include/with99.h
+++ b/include/with99.h
@@ -13,8 +13,8 @@
 #error Your Metalang99 is a bit mouldy, update to v1.13.2 or later.
 #endif
 
-#define WITH99_MAJOR 2
-#define WITH99_MINOR 1
+#define WITH99_MAJOR 3
+#define WITH99_MINOR 0
 #define WITH99_PATCH 0
 
 #define WITH99_VERSION_COMPATIBLE(x, y, z) (WITH99_MAJOR == (x) && ((WITH99_MINOR == (y) && WITH99_PATCH >= (z)) || (WITH99_MINOR > (y))))
diff --git a/include/with99/defres.h b/include/with99/defres.h
index 6aeec60..c49052f 100644
--- a/include/with99/defres.h
+++ b/include/with99/defres.h
@@ -1,14 +1,14 @@
 #ifndef WITH99_DEFRES_H
 #define WITH99_DEFRES_H
 
-#define WITH99_resource_Adhoc_IMPL(var, type, init, deinit) \
+#define WITH99_resource_Adhoc_IMPL(type, var, init, deinit) \
 	ML99_tuple(\
 	 ML99_just(v(type var)),\
 	 ML99_just(v((init, 1))),\
 	 ML99_just(v((deinit)))\
 	)
 
-#define WITH99_resource_AdhocThrows_IMPL(var, type, init, deinit) \
+#define WITH99_resource_AdhocThrows_IMPL(type, var, init, deinit) \
 	ML99_tuple(\
 	 ML99_just(v(type var)),\
 	 ML99_just(v((init))),\