diff --git a/src/ecwam/ecwam_loki.config b/src/ecwam/ecwam_loki.config
index 794a588f..96c54136 100644
--- a/src/ecwam/ecwam_loki.config
+++ b/src/ecwam/ecwam_loki.config
@@ -4,72 +4,39 @@ role = "kernel"
 expand =  true
 strict =  true
 replicate = true
+
+# Ensure that we are never adding these to the tree, and thus
+# do not attempt to look up the source files for these.
 disable = [
-  "DR_HOOK", "lhook", "jphook", "omp_get_wtime", "flush", "jwim",
-  "jwrb", "jwru", "jwro", "environment", "frequency",
-  "forcing_fields", "intgt_param_fields", "wave2ocean", "abort1",
-  "iu06"
+  'yomhook', 'abor1', 'abort1', 'gstats', 'yowgstats', 'wam_user_clock',
+  'parkind1', 'propag_wam', 'newwind', 'oml_mod', 'field_module', 'incdate',
+  'ieee_arithmetic',  # intrinsic modules (should have INTRINSIC in their USE statement)
+  'mfeb_length', 'cdm', # internal functions
+  'outwspec_io_serv_handler', 'outint_io_serv_handler', 'ifstowam_handler', # procedure pointers
+  '*%init', '*%update_view', '*%final', '*%ensure_host', '*%update_device'
 ]
+
+# Prune the tree for these to ensure they are not processed by transformations
+block = ['ec_parkind', 'parkind_wave']
+
 utility_routines = ['dr_hook', 'abort1', 'write(iu06']
-enable_imports = false
 
 # Define entry point for call-tree transformation
-[routines]
-
 [routines.wamintgr]
   role = "driver"
   expand = true
   replicate = false
-  disable = [
-    "PROPAG_WAM", "NEWWIND", "GSTATS", "FREQUENCY_FIELD%INIT",
-    "ENVIRONMENT_FIELD%INIT", "FORCING_FIELDS_FIELD%INIT",
-    "WAVE2OCEAN_FIELD%INIT", "INTGT_PARAM_FIELDS_FIELD%INIT",
-    "FREQUENCY_FIELD%UPDATE_VIEW", "ENVIRONMENT_FIELD%UPDATE_VIEW",
-    "FORCING_FIELDS_FIELD%UPDATE_VIEW", "WAVE2OCEAN_FIELD%UPDATE_VIEW",
-    "INTGT_PARAM_FIELDS_FIELD%UPDATE_VIEW",
-    "SOURCE_CONTRIBS_FIELD%INIT", "SOURCE_CONTRIBS_FIELD%UPDATE_VIEW",
-    "INCDATE", "DR_HOOK", "omp_get_wtime", "abort1", "wam_user_clock",
-    "FREQUENCY_FIELD%FINAL", "ENVIRONMENT_FIELD%FINAL",
-    "FORCING_FIELDS_FIELD%FINAL", "WAVE2OCEAN_FIELD%FINAL",
-    "INTGT_PARAM_FIELDS_FIELD%FINAL", "SOURCE_CONTRIBS_FIELD%INIT",
-    "SOURCE_CONTRIBS_FIELD%FINAL"
- ]
- real_kind = 'JWRB'
+  real_kind = 'JWRB'
  
 # add inline function calls here to force the plan to add them
 [routines.chnkmin]
-  role = "kernel"
-  replicate = true
-  disable = ["DR_HOOK", "lhook", "jphook", "jwrb", "jwru", "jwim"]
-
 [routines.ns_gc]
-  role = "kernel"
-  replicate = true
-  disable = ["DR_HOOK", "lhook", "jphook", "jwrb", "jwru", "jwim"]
-
 [routines.stress_gc]
-  role = "kernel"
-  replicate = true
-  disable = ["DR_HOOK", "lhook", "jphook", "jwrb", "jwru", "jwim"]
-
 [routines.transf_snl]
-  role = "kernel"
-  replicate = true
-  disable = ["DR_HOOK", "lhook", "jphook", "jwrb", "jwru", "jwim"]
-
 [routines.transf]
-  role = "kernel"
-  replicate = true
-  disable = ["DR_HOOK", "lhook", "jphook", "jwrb", "jwru", "jwim"]
-
 [routines.aki_ice]
-  role = "kernel"
-  expand = false
-  replicate = true
 
 # Define indices and bounds for array dimensions
-[dimensions]
-
 [dimensions.horizontal]
   size = "KIJL"
   index = "IJ"
diff --git a/src/ecwam/ecwam_loki_gpu.config b/src/ecwam/ecwam_loki_gpu.config
index cc1bf74a..548d0893 100644
--- a/src/ecwam/ecwam_loki_gpu.config
+++ b/src/ecwam/ecwam_loki_gpu.config
@@ -4,78 +4,39 @@ role = "kernel"
 expand =  true
 strict =  true
 replicate = true
+
+# Ensure that we are never adding these to the tree, and thus
+# do not attempt to look up the source files for these.
 disable = [
-  "DR_HOOK", "lhook", "jphook", "omp_get_wtime", "flush", "jwim",
-  "jwrb", "jwru", "jwro", "environment", "frequency",
-  "forcing_fields", "intgt_param_fields", "wave2ocean", "abort1",
-  "iu06"
+  'yomhook', 'abor1', 'abort1', 'gstats', 'yowgstats', 'wam_user_clock',
+  'parkind1', 'propag_wam', 'newwind', 'oml_mod', 'field_module', 'incdate',
+  'ieee_arithmetic',  # intrinsic modules (should have INTRINSIC in their USE statement)
+  'mfeb_length', 'cdm', # internal functions
+  'outwspec_io_serv_handler', 'outint_io_serv_handler', 'ifstowam_handler', # procedure pointers
+  '*%init', '*%update_view', '*%final', '*%ensure_host', '*%update_device'
 ]
+
+# Prune the tree for these to ensure they are not processed by transformations
+block = ['ec_parkind', 'parkind_wave']
+
 utility_routines = ['dr_hook', 'abort1', 'write(iu06']
-enable_imports = true
 
 # Define entry point for call-tree transformation
-[routines]
-
 [routines.wamintgr_loki_gpu]
   role = "driver"
   expand = true
   replicate = false
-  disable = [
-    "PROPAG_WAM", "NEWWIND", "GSTATS", "FREQUENCY_FIELD%INIT",
-    "ENVIRONMENT_FIELD%INIT", "FORCING_FIELDS_FIELD%INIT",
-    "WAVE2OCEAN_FIELD%INIT", "INTGT_PARAM_FIELDS_FIELD%INIT",
-    "FREQUENCY_FIELD%UPDATE_DEVICE", "ENVIRONMENT_FIELD%UPDATE_DEVICE",
-    "FORCING_FIELDS_FIELD%UPDATE_DEVICE",
-    "WAVE2OCEAN_FIELD%UPDATE_DEVICE",
-    "INTGT_PARAM_FIELDS_FIELD%UPDATE_DEVICE",
-    "SOURCE_CONTRIBS_FIELD%INIT", "SOURCE_CONTRIBS_FIELD%UPDATE_DEVICE",
-    "INCDATE", "DR_HOOK", "omp_get_wtime", "abort1", "wam_user_clock",
-    "FREQUENCY_FIELD%ENSURE_HOST", "ENVIRONMENT_FIELD%ENSURE_HOST",
-    "FORCING_FIELDS_FIELD%ENSURE_HOST", "WAVE2OCEAN_FIELD%ENSURE_HOST",
-    "INTGT_PARAM_FIELDS_FIELD%ENSURE_HOST",
-    "SOURCE_CONTRIBS_FIELD%INIT", "SOURCE_CONTRIBS_FIELD%ENSURE_HOST",
-    "FREQUENCY_FIELD%FINAL", "ENVIRONMENT_FIELD%FINAL",
-    "FORCING_FIELDS_FIELD%FINAL", "WAVE2OCEAN_FIELD%FINAL",
-    "INTGT_PARAM_FIELDS_FIELD%FINAL", "SOURCE_CONTRIBS_FIELD%INIT",
-    "SOURCE_CONTRIBS_FIELD%FINAL"
-  ]
-  enable_imports = false
   real_kind = 'JWRB'
 
 # add inline function calls here to force the plan to add them
 [routines.chnkmin]
-  role = "kernel"
-  replicate = true
-  disable = ["DR_HOOK", "lhook", "jphook", "jwrb", "jwru", "jwim"]
-
 [routines.ns_gc]
-  role = "kernel"
-  replicate = true
-  disable = ["DR_HOOK", "lhook", "jphook", "jwrb", "jwru", "jwim"]
-
 [routines.stress_gc]
-  role = "kernel"
-  replicate = true
-  disable = ["DR_HOOK", "lhook", "jphook", "jwrb", "jwru", "jwim"]
-
 [routines.transf_snl]
-  role = "kernel"
-  replicate = true
-  disable = ["DR_HOOK", "lhook", "jphook", "jwrb", "jwru", "jwim"]
-
 [routines.transf]
-  role = "kernel"
-  replicate = true
-  disable = ["DR_HOOK", "lhook", "jphook", "jwrb", "jwru", "jwim"]
-
 [routines.aki_ice]
-  role = "kernel"
-  expand = false
-  replicate = true
 
 # Define indices and bounds for array dimensions
-[dimensions]
-
 [dimensions.horizontal]
   size = "KIJL"
   index = "IJ"