diff --git a/mps/code/amsss.c b/mps/code/amsss.c
index 0e8b5cc5ace..c01f37194db 100644
--- a/mps/code/amsss.c
+++ b/mps/code/amsss.c
@@ -219,28 +219,54 @@ int main(int argc, char *argv[])
   die(mps_chain_create(&chain, arena, 1, testChain), "chain_create");
 
   printf("\n\n****************************** Testing AMS Debug\n");
-  die(mps_pool_create(&pool, arena, mps_class_ams_debug(), &freecheckOptions,
-                      format, chain, FALSE),
-      "pool_create(ams_debug,share)");
+  MPS_ARGS_BEGIN(args) {
+    MPS_ARGS_ADD(args, MPS_KEY_CHAIN, chain);
+    MPS_ARGS_ADD(args, MPS_KEY_FORMAT, format);
+    MPS_ARGS_ADD(args, MPS_KEY_AMS_SUPPORT_AMBIGUOUS, FALSE);
+    MPS_ARGS_ADD(args, MPS_KEY_POOL_DEBUG_OPTIONS, &freecheckOptions);
+    MPS_ARGS_DONE(args);
+    die(mps_pool_create_k(&pool, arena, mps_class_ams_debug(), args),
+        "pool_create(ams_debug,share)");
+  } MPS_ARGS_END(args);
   mps_tramp(&r, test, pool, 0);
   mps_pool_destroy(pool);
 
   printf("\n\n****************************** Testing AMS Debug\n");
-  die(mps_pool_create(&pool, arena, mps_class_ams_debug(), &freecheckOptions,
-                      format, chain, TRUE),
-      "pool_create(ams_debug,ambig)");
+  MPS_ARGS_BEGIN(args) {
+    MPS_ARGS_ADD(args, MPS_KEY_CHAIN, chain);
+    MPS_ARGS_ADD(args, MPS_KEY_FORMAT, format);
+    MPS_ARGS_ADD(args, MPS_KEY_AMS_SUPPORT_AMBIGUOUS, TRUE);
+    MPS_ARGS_ADD(args, MPS_KEY_POOL_DEBUG_OPTIONS, &freecheckOptions);
+    MPS_ARGS_DONE(args);
+    die(mps_pool_create_k(&pool, arena, mps_class_ams_debug(), args),
+        "pool_create(ams_debug,ambig)");
+  } MPS_ARGS_END(args);
   mps_tramp(&r, test, pool, 1);
   mps_pool_destroy(pool);
 
   printf("\n\n****************************** Testing AMS\n");
-  die(mps_pool_create(&pool, arena, mps_class_ams(), format, chain, TRUE),
-      "pool_create(ams,ambig)");
+  MPS_ARGS_BEGIN(args) {
+    MPS_ARGS_ADD(args, MPS_KEY_CHAIN, chain);
+    MPS_ARGS_ADD(args, MPS_KEY_FORMAT, format);
+    MPS_ARGS_ADD(args, MPS_KEY_AMS_SUPPORT_AMBIGUOUS, TRUE);
+    MPS_ARGS_ADD(args, MPS_KEY_POOL_DEBUG_OPTIONS, &freecheckOptions);
+    MPS_ARGS_DONE(args);
+    die(mps_pool_create_k(&pool, arena, mps_class_ams(), args),
+        "pool_create(ams,ambig)");
+  } MPS_ARGS_END(args);
   mps_tramp(&r, test, pool, 1);
   mps_pool_destroy(pool);
 
   printf("\n\n****************************** Testing AMS\n");
-  die(mps_pool_create(&pool, arena, mps_class_ams(), format, chain, FALSE),
-      "pool_create(ams,share)");
+  MPS_ARGS_BEGIN(args) {
+    MPS_ARGS_ADD(args, MPS_KEY_CHAIN, chain);
+    MPS_ARGS_ADD(args, MPS_KEY_FORMAT, format);
+    MPS_ARGS_ADD(args, MPS_KEY_AMS_SUPPORT_AMBIGUOUS, FALSE);
+    MPS_ARGS_ADD(args, MPS_KEY_POOL_DEBUG_OPTIONS, &freecheckOptions);
+    MPS_ARGS_DONE(args);
+    die(mps_pool_create_k(&pool, arena, mps_class_ams(), args),
+        "pool_create(ams,share)");
+  } MPS_ARGS_END(args);
   mps_tramp(&r, test, pool, 0);
   mps_pool_destroy(pool);