diff --git a/include/arkode/arkode_arkstep.h b/include/arkode/arkode_arkstep.h
index 35aa1c2494..4736d74f63 100644
--- a/include/arkode/arkode_arkstep.h
+++ b/include/arkode/arkode_arkstep.h
@@ -34,33 +34,37 @@ extern "C" {
 
 /* Default Butcher tables for each method/order */
 
+/* Ideally these defaults would be declared with types ARKODE_ERKTableID and
+ * ARKODE_DIRKTableID, but this causes swig to unnecessarily append `C_INT` to
+ * the variable names */
+
 /*    explicit */
-static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_1 = ARKODE_FORWARD_EULER_1_1;
-static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_2 = ARKODE_RALSTON_3_1_2;
-static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_3 = ARKODE_BOGACKI_SHAMPINE_4_2_3;
-static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_4 = ARKODE_SOFRONIOU_SPALETTA_5_3_4;
-static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_5 = ARKODE_TSITOURAS_7_4_5;
-static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_6 = ARKODE_VERNER_9_5_6;
-static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_7 = ARKODE_VERNER_10_6_7;
-static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_8 = ARKODE_VERNER_13_7_8;
-static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_9 = ARKODE_VERNER_16_8_9;
+static const int ARKSTEP_DEFAULT_ERK_1 = ARKODE_FORWARD_EULER_1_1;
+static const int ARKSTEP_DEFAULT_ERK_2 = ARKODE_RALSTON_3_1_2;
+static const int ARKSTEP_DEFAULT_ERK_3 = ARKODE_BOGACKI_SHAMPINE_4_2_3;
+static const int ARKSTEP_DEFAULT_ERK_4 = ARKODE_SOFRONIOU_SPALETTA_5_3_4;
+static const int ARKSTEP_DEFAULT_ERK_5 = ARKODE_TSITOURAS_7_4_5;
+static const int ARKSTEP_DEFAULT_ERK_6 = ARKODE_VERNER_9_5_6;
+static const int ARKSTEP_DEFAULT_ERK_7 = ARKODE_VERNER_10_6_7;
+static const int ARKSTEP_DEFAULT_ERK_8 = ARKODE_VERNER_13_7_8;
+static const int ARKSTEP_DEFAULT_ERK_9 = ARKODE_VERNER_16_8_9;
 
 /*    implicit */
-static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_DIRK_1 = ARKODE_BACKWARD_EULER_1_1;
-static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_DIRK_2 = ARKODE_ARK2_DIRK_3_1_2;
-static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_DIRK_3 = ARKODE_ESDIRK325L2SA_5_2_3;
-static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_DIRK_4 = ARKODE_ESDIRK436L2SA_6_3_4;
-static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_DIRK_5 = ARKODE_ESDIRK547L2SA2_7_4_5;
+static const int ARKSTEP_DEFAULT_DIRK_1 = ARKODE_BACKWARD_EULER_1_1;
+static const int ARKSTEP_DEFAULT_DIRK_2 = ARKODE_ARK2_DIRK_3_1_2;
+static const int ARKSTEP_DEFAULT_DIRK_3 = ARKODE_ESDIRK325L2SA_5_2_3;
+static const int ARKSTEP_DEFAULT_DIRK_4 = ARKODE_ESDIRK436L2SA_6_3_4;
+static const int ARKSTEP_DEFAULT_DIRK_5 = ARKODE_ESDIRK547L2SA2_7_4_5;
 
 /*    ImEx */
-static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ARK_ETABLE_2 = ARKODE_ARK2_ERK_3_1_2;
-static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ARK_ETABLE_3 = ARKODE_ARK324L2SA_ERK_4_2_3;
-static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ARK_ETABLE_4 = ARKODE_ARK437L2SA_ERK_7_3_4;
-static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ARK_ETABLE_5 = ARKODE_ARK548L2SAb_ERK_8_4_5;
-static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_ARK_ITABLE_2 = ARKODE_ARK2_DIRK_3_1_2;
-static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_ARK_ITABLE_3 = ARKODE_ARK324L2SA_DIRK_4_2_3;
-static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_ARK_ITABLE_4 = ARKODE_ARK437L2SA_DIRK_7_3_4;
-static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_ARK_ITABLE_5 = ARKODE_ARK548L2SAb_DIRK_8_4_5;
+static const int ARKSTEP_DEFAULT_ARK_ETABLE_2 = ARKODE_ARK2_ERK_3_1_2;
+static const int ARKSTEP_DEFAULT_ARK_ETABLE_3 = ARKODE_ARK324L2SA_ERK_4_2_3;
+static const int ARKSTEP_DEFAULT_ARK_ETABLE_4 = ARKODE_ARK437L2SA_ERK_7_3_4;
+static const int ARKSTEP_DEFAULT_ARK_ETABLE_5 = ARKODE_ARK548L2SAb_ERK_8_4_5;
+static const int ARKSTEP_DEFAULT_ARK_ITABLE_2 = ARKODE_ARK2_DIRK_3_1_2;
+static const int ARKSTEP_DEFAULT_ARK_ITABLE_3 = ARKODE_ARK324L2SA_DIRK_4_2_3;
+static const int ARKSTEP_DEFAULT_ARK_ITABLE_4 = ARKODE_ARK437L2SA_DIRK_7_3_4;
+static const int ARKSTEP_DEFAULT_ARK_ITABLE_5 = ARKODE_ARK548L2SAb_DIRK_8_4_5;
 
 /* -------------------
  * Exported Functions
diff --git a/include/arkode/arkode_erkstep.h b/include/arkode/arkode_erkstep.h
index 614e296437..c8a5b883e6 100644
--- a/include/arkode/arkode_erkstep.h
+++ b/include/arkode/arkode_erkstep.h
@@ -32,15 +32,15 @@ extern "C" {
 
 /* Default Butcher tables for each order */
 
-static const ARKODE_ERKTableID ERKSTEP_DEFAULT_1 = ARKODE_FORWARD_EULER_1_1;
-static const ARKODE_ERKTableID ERKSTEP_DEFAULT_2 = ARKODE_RALSTON_3_1_2;
-static const ARKODE_ERKTableID ERKSTEP_DEFAULT_3 = ARKODE_BOGACKI_SHAMPINE_4_2_3;
-static const ARKODE_ERKTableID ERKSTEP_DEFAULT_4 = ARKODE_SOFRONIOU_SPALETTA_5_3_4;
-static const ARKODE_ERKTableID ERKSTEP_DEFAULT_5 = ARKODE_TSITOURAS_7_4_5;
-static const ARKODE_ERKTableID ERKSTEP_DEFAULT_6 = ARKODE_VERNER_9_5_6;
-static const ARKODE_ERKTableID ERKSTEP_DEFAULT_7 = ARKODE_VERNER_10_6_7;
-static const ARKODE_ERKTableID ERKSTEP_DEFAULT_8 = ARKODE_VERNER_13_7_8;
-static const ARKODE_ERKTableID ERKSTEP_DEFAULT_9 = ARKODE_VERNER_16_8_9;
+static const int ERKSTEP_DEFAULT_1 = ARKODE_FORWARD_EULER_1_1;
+static const int ERKSTEP_DEFAULT_2 = ARKODE_RALSTON_3_1_2;
+static const int ERKSTEP_DEFAULT_3 = ARKODE_BOGACKI_SHAMPINE_4_2_3;
+static const int ERKSTEP_DEFAULT_4 = ARKODE_SOFRONIOU_SPALETTA_5_3_4;
+static const int ERKSTEP_DEFAULT_5 = ARKODE_TSITOURAS_7_4_5;
+static const int ERKSTEP_DEFAULT_6 = ARKODE_VERNER_9_5_6;
+static const int ERKSTEP_DEFAULT_7 = ARKODE_VERNER_10_6_7;
+static const int ERKSTEP_DEFAULT_8 = ARKODE_VERNER_13_7_8;
+static const int ERKSTEP_DEFAULT_9 = ARKODE_VERNER_16_8_9;
 
 /* -------------------
  * Exported Functions