diff --git a/bin/lwresd/main.c b/bin/lwresd/main.c
index 0d4c58a470..4b08db4336 100644
--- a/bin/lwresd/main.c
+++ b/bin/lwresd/main.c
@@ -328,7 +328,7 @@ main(int argc, char **argv)
 			       NULL, NULL);
 		ISC_LIST_INIT(cmgr[i].idle);
 		ISC_LIST_INIT(cmgr[i].running);
-		result = isc_task_create(taskmgr, mem, 0, &cmgr[i].task);
+		result = isc_task_create(taskmgr, 0, &cmgr[i].task);
 		if (result != ISC_R_SUCCESS)
 			break;
 		isc_task_setname(cmgr[i].task, "lwresd client", &cmgr[i]);
diff --git a/bin/named/client.c b/bin/named/client.c
index 1f77f65146..6b134ab937 100644
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -1112,8 +1112,7 @@ client_create(ns_clientmgr_t *manager, ns_client_t **clientp)
 		return (ISC_R_NOMEMORY);
 
 	client->task = NULL;
-	result = isc_task_create(manager->taskmgr, manager->mctx, 0,
-				 &client->task);
+	result = isc_task_create(manager->taskmgr, 0, &client->task);
 	if (result != ISC_R_SUCCESS)
 		goto cleanup_client;
 	isc_task_setname(client->task, "client", client);
diff --git a/bin/named/interfacemgr.c b/bin/named/interfacemgr.c
index 5d52226d2f..c472df98d6 100644
--- a/bin/named/interfacemgr.c
+++ b/bin/named/interfacemgr.c
@@ -221,7 +221,7 @@ ns_interface_create(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr,
 	 * Create a task.
 	 */
 	ifp->task = NULL;
-	result = isc_task_create(mgr->taskmgr, mgr->mctx, 0, &ifp->task);
+	result = isc_task_create(mgr->taskmgr, 0, &ifp->task);
 	if (result != ISC_R_SUCCESS) {
 		isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_ERROR,
 				 "isc_task_create() failed: %s",
diff --git a/bin/tests/adb_test.c b/bin/tests/adb_test.c
index bab49b4b71..9587b15f5c 100644
--- a/bin/tests/adb_test.c
+++ b/bin/tests/adb_test.c
@@ -320,10 +320,10 @@ main(int argc, char **argv)
 	create_managers();
 
 	t1 = NULL;
-	result = isc_task_create(taskmgr, NULL, 0, &t1);
+	result = isc_task_create(taskmgr, 0, &t1);
 	check_result(result, "isc_task_create t1");
 	t2 = NULL;
-	result = isc_task_create(taskmgr, NULL, 0, &t2);
+	result = isc_task_create(taskmgr, 0, &t2);
 	check_result(result, "isc_task_create t2");
 
 	printf("task 1 = %p\n", t1);
diff --git a/bin/tests/byaddr_test.c b/bin/tests/byaddr_test.c
index 03be519735..1fb496291d 100644
--- a/bin/tests/byaddr_test.c
+++ b/bin/tests/byaddr_test.c
@@ -141,7 +141,7 @@ main(int argc, char *argv[]) {
 	RUNTIME_CHECK(isc_taskmgr_create(mctx, workers, 0, &taskmgr) ==
 		      ISC_R_SUCCESS);
 	task = NULL;
-	RUNTIME_CHECK(isc_task_create(taskmgr, mctx, 0, &task) ==
+	RUNTIME_CHECK(isc_task_create(taskmgr, 0, &task) ==
 		      ISC_R_SUCCESS);
 
 	timermgr = NULL;
diff --git a/bin/tests/byname_test.c b/bin/tests/byname_test.c
index bd1bcb1737..afb66b4958 100644
--- a/bin/tests/byname_test.c
+++ b/bin/tests/byname_test.c
@@ -268,7 +268,7 @@ main(int argc, char *argv[]) {
 	RUNTIME_CHECK(isc_taskmgr_create(mctx, workers, 0, &taskmgr) ==
 		      ISC_R_SUCCESS);
 	task = NULL;
-	RUNTIME_CHECK(isc_task_create(taskmgr, mctx, 0, &task) ==
+	RUNTIME_CHECK(isc_task_create(taskmgr, 0, &task) ==
 		      ISC_R_SUCCESS);
 
 	timermgr = NULL;
diff --git a/bin/tests/dispatch_tcp_test.c b/bin/tests/dispatch_tcp_test.c
index 8c867f1ee6..e45ea94f6b 100644
--- a/bin/tests/dispatch_tcp_test.c
+++ b/bin/tests/dispatch_tcp_test.c
@@ -367,11 +367,11 @@ main(int argc, char *argv[])
 		      ISC_R_SUCCESS);
 
 	t0 = NULL;
-	RUNTIME_CHECK(isc_task_create(manager, NULL, 0, &t0) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_task_create(manager, 0, &t0) == ISC_R_SUCCESS);
 	t1 = NULL;
-	RUNTIME_CHECK(isc_task_create(manager, NULL, 0, &t1) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_task_create(manager, 0, &t1) == ISC_R_SUCCESS);
 	t2 = NULL;
-	RUNTIME_CHECK(isc_task_create(manager, NULL, 0, &t2) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_task_create(manager, 0, &t2) == ISC_R_SUCCESS);
 
 	socketmgr = NULL;
 	RUNTIME_CHECK(isc_socketmgr_create(mctx, &socketmgr) == ISC_R_SUCCESS);
diff --git a/bin/tests/dispatch_test.c b/bin/tests/dispatch_test.c
index 7ba7dfc1c5..b9886905dd 100644
--- a/bin/tests/dispatch_test.c
+++ b/bin/tests/dispatch_test.c
@@ -378,11 +378,11 @@ main(int argc, char *argv[])
 		      ISC_R_SUCCESS);
 
 	t0 = NULL;
-	RUNTIME_CHECK(isc_task_create(manager, NULL, 0, &t0) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_task_create(manager, 0, &t0) == ISC_R_SUCCESS);
 	t1 = NULL;
-	RUNTIME_CHECK(isc_task_create(manager, NULL, 0, &t1) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_task_create(manager, 0, &t1) == ISC_R_SUCCESS);
 	t2 = NULL;
-	RUNTIME_CHECK(isc_task_create(manager, NULL, 0, &t2) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_task_create(manager, 0, &t2) == ISC_R_SUCCESS);
 
 	socketmgr = NULL;
 	RUNTIME_CHECK(isc_socketmgr_create(mctx, &socketmgr) == ISC_R_SUCCESS);
diff --git a/bin/tests/ratelimiter_test.c b/bin/tests/ratelimiter_test.c
index 5a0dd152d4..851a6a421c 100644
--- a/bin/tests/ratelimiter_test.c
+++ b/bin/tests/ratelimiter_test.c
@@ -72,7 +72,7 @@ main(int argc, char *argv[]) {
 		      ISC_R_SUCCESS);
 	RUNTIME_CHECK(isc_timermgr_create(mctx, &timermgr) ==
 		      ISC_R_SUCCESS);
-	RUNTIME_CHECK(isc_task_create(taskmgr, mctx, 0, &task) ==
+	RUNTIME_CHECK(isc_task_create(taskmgr, 0, &task) ==
 		      ISC_R_SUCCESS);
 
 	RUNTIME_CHECK(isc_ratelimiter_create(mctx, timermgr, task, 
diff --git a/bin/tests/res_test.c b/bin/tests/res_test.c
index fa2e47a1c6..5b053d78dd 100644
--- a/bin/tests/res_test.c
+++ b/bin/tests/res_test.c
@@ -177,10 +177,10 @@ main(int argc, char *argv[]) {
 	RUNTIME_CHECK(isc_taskmgr_create(mctx, workers, 0, &taskmgr) ==
 		      ISC_R_SUCCESS);
 	task1 = NULL;
-	RUNTIME_CHECK(isc_task_create(taskmgr, mctx, 0, &task1) ==
+	RUNTIME_CHECK(isc_task_create(taskmgr, 0, &task1) ==
 		      ISC_R_SUCCESS);
 	task2 = NULL;
-	RUNTIME_CHECK(isc_task_create(taskmgr, mctx, 0, &task2) ==
+	RUNTIME_CHECK(isc_task_create(taskmgr, 0, &task2) ==
 		      ISC_R_SUCCESS);
 	timermgr = NULL;
 	RUNTIME_CHECK(isc_timermgr_create(mctx, &timermgr) == ISC_R_SUCCESS);
diff --git a/bin/tests/sdig.c b/bin/tests/sdig.c
index 02aee63e70..64cff0c0da 100644
--- a/bin/tests/sdig.c
+++ b/bin/tests/sdig.c
@@ -265,7 +265,7 @@ main(int argc, char *argv[]) {
 	result = isc_taskmgr_create(mctx, 1, 0, &taskmgr);
 	check_result(result, "isc_taskmgr_create()");
 	task = NULL;
-	result = isc_task_create(taskmgr, NULL, 0, &task);
+	result = isc_task_create(taskmgr, 0, &task);
 	check_result(result, "isc_task_create()");
 	socketmgr = NULL;
 	result = isc_socketmgr_create(mctx, &socketmgr);
diff --git a/bin/tests/shutdown_test.c b/bin/tests/shutdown_test.c
index 78701372e5..7760717c0b 100644
--- a/bin/tests/shutdown_test.c
+++ b/bin/tests/shutdown_test.c
@@ -154,7 +154,7 @@ new_task(isc_mem_t *mctx, char *name) {
 		strcpy(ti->name, name);
 	} else
 		sprintf(ti->name, "%d", task_count);
-	RUNTIME_CHECK(isc_task_create(task_manager, mctx, 0, &ti->task) ==
+	RUNTIME_CHECK(isc_task_create(task_manager, 0, &ti->task) ==
 		      ISC_R_SUCCESS);
 	RUNTIME_CHECK(isc_task_onshutdown(ti->task, shutdown_action, ti) ==
 		      ISC_R_SUCCESS);
@@ -209,14 +209,14 @@ main(int argc, char *argv[]) {
 	 * Test implicit shutdown.
 	 */
 	task = NULL;
-	RUNTIME_CHECK(isc_task_create(task_manager, mctx, 0, &task) ==
+	RUNTIME_CHECK(isc_task_create(task_manager, 0, &task) ==
 		      ISC_R_SUCCESS);
 	isc_task_detach(&task);
 
 	/*
 	 * Test anti-zombie code.
 	 */
-	RUNTIME_CHECK(isc_task_create(task_manager, mctx, 0, &task) ==
+	RUNTIME_CHECK(isc_task_create(task_manager, 0, &task) ==
 		      ISC_R_SUCCESS);
 	isc_task_detach(&task);
 
diff --git a/bin/tests/sock_test.c b/bin/tests/sock_test.c
index e15d7c4747..2c5d418f3d 100644
--- a/bin/tests/sock_test.c
+++ b/bin/tests/sock_test.c
@@ -223,7 +223,7 @@ my_listen(isc_task_t *task, isc_event_t *event)
 		 * recv on it.
 		 */
 		newtask = NULL;
-		RUNTIME_CHECK(isc_task_create(manager, NULL, 0, &newtask)
+		RUNTIME_CHECK(isc_task_create(manager, 0, &newtask)
 			      == ISC_R_SUCCESS);
 		isc_socket_recv(dev->newsocket, &region, 1,
 				newtask, my_recv, event->arg);
@@ -302,9 +302,9 @@ main(int argc, char *argv[])
 	RUNTIME_CHECK(isc_timermgr_create(mctx, &timgr) == ISC_R_SUCCESS);
 
 	t1 = NULL;
-	RUNTIME_CHECK(isc_task_create(manager, NULL, 0, &t1) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_task_create(manager, 0, &t1) == ISC_R_SUCCESS);
 	t2 = NULL;
-	RUNTIME_CHECK(isc_task_create(manager, NULL, 0, &t2) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_task_create(manager, 0, &t2) == ISC_R_SUCCESS);
 	RUNTIME_CHECK(isc_task_onshutdown(t1, my_shutdown, "1") ==
 		      ISC_R_SUCCESS);
 	RUNTIME_CHECK(isc_task_onshutdown(t2, my_shutdown, "2") ==
diff --git a/bin/tests/task_test.c b/bin/tests/task_test.c
index 2772c6e894..c2fa4d77dc 100644
--- a/bin/tests/task_test.c
+++ b/bin/tests/task_test.c
@@ -83,10 +83,10 @@ main(int argc, char *argv[]) {
 	RUNTIME_CHECK(isc_taskmgr_create(mctx, workers, 0, &manager) ==
 		      ISC_R_SUCCESS);
 
-	RUNTIME_CHECK(isc_task_create(manager, NULL, 0, &t1) == ISC_R_SUCCESS);
-	RUNTIME_CHECK(isc_task_create(manager, NULL, 0, &t2) == ISC_R_SUCCESS);
-	RUNTIME_CHECK(isc_task_create(manager, NULL, 0, &t3) == ISC_R_SUCCESS);
-	RUNTIME_CHECK(isc_task_create(manager, NULL, 0, &t4) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_task_create(manager, 0, &t1) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_task_create(manager, 0, &t2) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_task_create(manager, 0, &t3) == ISC_R_SUCCESS);
+	RUNTIME_CHECK(isc_task_create(manager, 0, &t4) == ISC_R_SUCCESS);
 
 	RUNTIME_CHECK(isc_task_onshutdown(t1, my_shutdown, "1") ==
 		      ISC_R_SUCCESS);
diff --git a/bin/tests/tasks/t_tasks.c b/bin/tests/tasks/t_tasks.c
index 4c9d909168..1ebae31765 100644
--- a/bin/tests/tasks/t_tasks.c
+++ b/bin/tests/tasks/t_tasks.c
@@ -134,25 +134,25 @@ t_tasks1() {
 		return(T_FAIL);
 	}
 
-	isc_result = isc_task_create(manager, NULL, 0, &task1);
+	isc_result = isc_task_create(manager, 0, &task1);
 	if (isc_result != ISC_R_SUCCESS) {
 		t_info("isc_task_create failed %d\n", isc_result);
 		return(T_FAIL);
 	}
 
-	isc_result = isc_task_create(manager, NULL, 0, &task2);
+	isc_result = isc_task_create(manager, 0, &task2);
 	if (isc_result != ISC_R_SUCCESS) {
 		t_info("isc_task_create failed %d\n", isc_result);
 		return(T_FAIL);
 	}
 
-	isc_result = isc_task_create(manager, NULL, 0, &task3);
+	isc_result = isc_task_create(manager, 0, &task3);
 	if (isc_result != ISC_R_SUCCESS) {
 		t_info("isc_task_create failed %d\n", isc_result);
 		return(T_FAIL);
 	}
 
-	isc_result = isc_task_create(manager, NULL, 0, &task4);
+	isc_result = isc_task_create(manager, 0, &task4);
 	if (isc_result != ISC_R_SUCCESS) {
 		t_info("isc_task_create failed %d\n", isc_result);
 		return(T_FAIL);
@@ -452,7 +452,7 @@ t2_callback(isc_task_t *task, isc_event_t *event)
 
 		/* create a new task and forward the message */
 		newtask = NULL;
-		isc_result = isc_task_create(T2_manager, NULL, 0, &newtask);
+		isc_result = isc_task_create(T2_manager, 0, &newtask);
 		if (isc_result != ISC_R_SUCCESS) {
 			t_info("isc_task_create failed %d\n", isc_result);
 			++T2_nfails;
@@ -737,7 +737,7 @@ t_tasks3() {
 	}
 
 	task = NULL;
-	isc_result = isc_task_create(tmgr, mctx, 0, &task);
+	isc_result = isc_task_create(tmgr, 0, &task);
 	if (isc_result != ISC_R_SUCCESS) {
 		t_info("isc_task_create failed %s\n",
 				isc_result_totext(isc_result));
@@ -953,7 +953,7 @@ t_tasks4() {
 	}
 
 	task = NULL;
-	isc_result = isc_task_create(tmgr, mctx, 0, &task);
+	isc_result = isc_task_create(tmgr, 0, &task);
 	if (isc_result != ISC_R_SUCCESS) {
 		t_info("isc_task_create failed %s\n",
 				isc_result_totext(isc_result));
@@ -1151,7 +1151,7 @@ t_tasks7() {
 	}
 
 	task = NULL;
-	isc_result = isc_task_create(tmgr, mctx, 0, &task);
+	isc_result = isc_task_create(tmgr, 0, &task);
 	if (isc_result != ISC_R_SUCCESS) {
 		t_info("isc_task_create failed %s\n",
 				isc_result_totext(isc_result));
@@ -1470,7 +1470,7 @@ t_taskpurge_x(	int sender, int type, int tag,
 	}
 
 	task = NULL;
-	isc_result = isc_task_create(tmgr, mctx, 0, &task);
+	isc_result = isc_task_create(tmgr, 0, &task);
 	if (isc_result != ISC_R_SUCCESS) {
 		t_info("isc_task_create failed %s\n",
 				isc_result_totext(isc_result));
@@ -1845,7 +1845,7 @@ t_tasks11(int purgable) {
 	}
 
 	task = NULL;
-	isc_result = isc_task_create(tmgr, mctx, 0, &task);
+	isc_result = isc_task_create(tmgr, 0, &task);
 	if (isc_result != ISC_R_SUCCESS) {
 		t_info("isc_task_create failed %s\n",
 				isc_result_totext(isc_result));
diff --git a/bin/tests/timer_test.c b/bin/tests/timer_test.c
index 4f1a19a465..3e8f3bdd7f 100644
--- a/bin/tests/timer_test.c
+++ b/bin/tests/timer_test.c
@@ -112,17 +112,15 @@ main(int argc, char *argv[]) {
 	printf("%d workers\n", workers);
 
 	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx1) == ISC_R_SUCCESS);
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx2) == ISC_R_SUCCESS);
-	RUNTIME_CHECK(isc_mem_create(0, 0, &mctx3) == ISC_R_SUCCESS);
 	RUNTIME_CHECK(isc_taskmgr_create(mctx1, workers, 0, &manager) ==
 		      ISC_R_SUCCESS);
 	RUNTIME_CHECK(isc_timermgr_create(mctx1, &timgr) == ISC_R_SUCCESS);
 
-	RUNTIME_CHECK(isc_task_create(manager, mctx1, 0, &t1) ==
+	RUNTIME_CHECK(isc_task_create(manager, 0, &t1) ==
 		      ISC_R_SUCCESS);
-	RUNTIME_CHECK(isc_task_create(manager, mctx2, 0, &t2) ==
+	RUNTIME_CHECK(isc_task_create(manager, 0, &t2) ==
 		      ISC_R_SUCCESS);
-	RUNTIME_CHECK(isc_task_create(manager, mctx3, 0, &t3) ==
+	RUNTIME_CHECK(isc_task_create(manager, 0, &t3) ==
 		      ISC_R_SUCCESS);
 	RUNTIME_CHECK(isc_task_onshutdown(t1, shutdown_task, "1") ==
 		      ISC_R_SUCCESS);
@@ -171,12 +169,6 @@ main(int argc, char *argv[]) {
 	printf("Statistics for mctx1:\n");
 	isc_mem_stats(mctx1, stdout);
 	isc_mem_destroy(&mctx1);
-	printf("Statistics for mctx2:\n");
-	isc_mem_stats(mctx2, stdout);
-	isc_mem_destroy(&mctx2);
-	printf("Statistics for mctx3:\n");
-	isc_mem_stats(mctx3, stdout);
-	isc_mem_destroy(&mctx3);
 
 	return (0);
 }
diff --git a/bin/tests/timers/t_timers.c b/bin/tests/timers/t_timers.c
index 278802abd4..d37670cfd9 100644
--- a/bin/tests/timers/t_timers.c
+++ b/bin/tests/timers/t_timers.c
@@ -239,7 +239,7 @@ t_timers_x(isc_timertype_t timertype, isc_time_t *expires,
 	}
 
 	task = NULL;
-	isc_result = isc_task_create(tmgr, mctx, 0, &task);
+	isc_result = isc_task_create(tmgr, 0, &task);
 	if (isc_result != ISC_R_SUCCESS) {
 		t_info("isc_task_create failed %s\n",
 				isc_result_totext(isc_result));
@@ -841,7 +841,7 @@ t_timers5() {
 	}
 
 	T5_task1 = NULL;
-	isc_result = isc_task_create(tmgr, mctx, 0, &T5_task1);
+	isc_result = isc_task_create(tmgr, 0, &T5_task1);
 	if (isc_result != ISC_R_SUCCESS) {
 		t_info("isc_task_create failed %s\n",
 				isc_result_totext(isc_result));
@@ -867,7 +867,7 @@ t_timers5() {
 	}
 
 	T5_task2 = NULL;
-	isc_result = isc_task_create(tmgr, mctx, 0, &T5_task2);
+	isc_result = isc_task_create(tmgr, 0, &T5_task2);
 	if (isc_result != ISC_R_SUCCESS) {
 		t_info("isc_task_create failed %s\n",
 				isc_result_totext(isc_result));
diff --git a/bin/tests/tkey_test.c b/bin/tests/tkey_test.c
index 2a8662cd09..de4ac3ea38 100644
--- a/bin/tests/tkey_test.c
+++ b/bin/tests/tkey_test.c
@@ -345,10 +345,10 @@ main(int argc, char *argv[]) {
 	RUNTIME_CHECK(isc_taskmgr_create(mctx, workers, 0, &taskmgr) ==
 		      ISC_R_SUCCESS);
 	task1 = NULL;
-	RUNTIME_CHECK(isc_task_create(taskmgr, mctx, 0, &task1) ==
+	RUNTIME_CHECK(isc_task_create(taskmgr, 0, &task1) ==
 		      ISC_R_SUCCESS);
 	task2 = NULL;
-	RUNTIME_CHECK(isc_task_create(taskmgr, mctx, 0, &task2) ==
+	RUNTIME_CHECK(isc_task_create(taskmgr, 0, &task2) ==
 		      ISC_R_SUCCESS);
 	timermgr = NULL;
 	RUNTIME_CHECK(isc_timermgr_create(mctx, &timermgr) == ISC_R_SUCCESS);
diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index 4c90e362b2..5df059e3e5 100644
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -2282,7 +2282,7 @@ dns_adb_create(isc_mem_t *mem, dns_view_t *view, isc_timermgr_t *timermgr,
 	/*
 	 * Allocate a timer and a task for our periodic cleanup.
 	 */
-	result = isc_task_create(adb->taskmgr, adb->mctx, 0, &adb->task);
+	result = isc_task_create(adb->taskmgr, 0, &adb->task);
 	if (result != ISC_R_SUCCESS)
 		goto fail3;
 	isc_task_setname(adb->task, "ADB", adb);
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index a05adecef1..6c78f984d8 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -3769,8 +3769,7 @@ dns_resolver_create(dns_view_t *view,
 		if (result != ISC_R_SUCCESS)
 			goto cleanup_buckets;
 		res->buckets[i].task = NULL;
-		result = isc_task_create(taskmgr, view->mctx, 0,
-					 &res->buckets[i].task);
+		result = isc_task_create(taskmgr, 0, &res->buckets[i].task);
 		if (result != ISC_R_SUCCESS) {
 			isc_mutex_destroy(&res->buckets[i].lock);
 			goto cleanup_buckets;
diff --git a/lib/dns/view.c b/lib/dns/view.c
index e7124f716a..e2e76f1bca 100644
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -355,7 +355,7 @@ dns_view_createresolver(dns_view_t *view,
 	REQUIRE(!view->frozen);
 	REQUIRE(view->resolver == NULL);
 
-	result = isc_task_create(taskmgr, view->mctx, 0, &view->task);
+	result = isc_task_create(taskmgr, 0, &view->task);
 	if (result != ISC_R_SUCCESS)
 		return (result);
 	isc_task_setname(view->task, "view", view);
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 19062704a0..5442d60d5e 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.91 2000/04/07 22:30:42 gson Exp $ */
+/* $Id: zone.c,v 1.92 2000/04/12 01:36:22 halley Exp $ */
 
 #include <config.h>
 
@@ -1899,7 +1899,7 @@ dns_zone_manage(dns_zone_t *zone, isc_taskmgr_t *tmgr) {
 	REQUIRE(DNS_ZONE_VALID(zone));
 	REQUIRE(zone->task == NULL);
 
-	result = isc_task_create(tmgr, zone->mctx, 0, &zone->task);
+	result = isc_task_create(tmgr, 0, &zone->task);
 	if (result != ISC_R_SUCCESS) {
 		/* XXX */
 		return (ISC_R_UNEXPECTED);
@@ -3169,7 +3169,7 @@ dns_zonemgr_create(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
 		goto free_transferlist;
 
 	/* Create a single task for queueing of SOA queries. */
-	result = isc_task_create(taskmgr, mctx, 1, &zmgr->task);
+	result = isc_task_create(taskmgr, 1, &zmgr->task);
 	if (result != ISC_R_SUCCESS)
 		goto free_taskpool;
 	isc_task_setname(zmgr->task, "zmgr", zmgr);
diff --git a/lib/isc/taskpool.c b/lib/isc/taskpool.c
index cf96d747de..dff4da169f 100644
--- a/lib/isc/taskpool.c
+++ b/lib/isc/taskpool.c
@@ -53,7 +53,7 @@ isc_taskpool_create(isc_taskmgr_t *tmgr, isc_mem_t *mctx,
 	for (i = 0; i < ntasks; i++) 
 		pool->tasks[i] = NULL;
 	for (i = 0; i < ntasks; i++) {
-		result = isc_task_create(tmgr, mctx, quantum, &pool->tasks[i]);
+		result = isc_task_create(tmgr, quantum, &pool->tasks[i]);
 		if (result != ISC_R_SUCCESS) {
 			isc_taskpool_destroy(&pool);
 			return (result);
diff --git a/lib/omapi/connection.c b/lib/omapi/connection.c
index c7c8ecc097..29eeb75f31 100644
--- a/lib/omapi/connection.c
+++ b/lib/omapi/connection.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: connection.c,v 1.17 2000/03/14 03:46:14 tale Exp $ */
+/* $Id: connection.c,v 1.18 2000/04/12 01:40:58 halley Exp $ */
 
 /* Principal Author: DCL */
 
@@ -518,7 +518,7 @@ connect_toserver(omapi_object_t *protocol, const char *server_name, int port) {
 	/*
 	 * Prepare the task that will wait for the connection to be made.
 	 */
-	result = isc_task_create(omapi_taskmgr, NULL, 0, &task);
+	result = isc_task_create(omapi_taskmgr, 0, &task);
 	if (result != ISC_R_SUCCESS)
 		return (result);
 
diff --git a/lib/omapi/lib.c b/lib/omapi/lib.c
index 7830285902..4c7154d452 100644
--- a/lib/omapi/lib.c
+++ b/lib/omapi/lib.c
@@ -91,7 +91,7 @@ omapi_lib_init(isc_mem_t *mctx, isc_taskmgr_t *taskmgr,
 	omapi_taskmgr = taskmgr;
 	omapi_socketmgr = socketmgr;
 
-	result = isc_task_create(omapi_taskmgr, omapi_mctx, 0, &omapi_task);
+	result = isc_task_create(omapi_taskmgr, 0, &omapi_task);
 	if (result == ISC_R_SUCCESS)
 		isc_task_setname(omapi_task, "omapi", NULL);
 
diff --git a/lib/omapi/listener.c b/lib/omapi/listener.c
index e9cce19615..a720b723bf 100644
--- a/lib/omapi/listener.c
+++ b/lib/omapi/listener.c
@@ -168,7 +168,7 @@ listener_accept(isc_task_t *task, isc_event_t *event) {
 	 * The new connection is good to go.  Allocate the buffers for it and
 	 * prepare its own task.
 	 */
-	if (isc_task_create(omapi_taskmgr, NULL, 0, &connection_task) !=
+	if (isc_task_create(omapi_taskmgr, 0, &connection_task) !=
 	    ISC_R_SUCCESS)
 		goto free_task;
 
@@ -282,7 +282,7 @@ omapi_listener_listen(omapi_object_t *caller, isc_sockaddr_t *addr,
 	REQUIRE(addr != NULL && isc_sockaddr_getport(addr) != 0);
 
 	task = NULL;
-	result = isc_task_create(omapi_taskmgr, NULL, 0, &task);
+	result = isc_task_create(omapi_taskmgr, 0, &task);
 	if (result != ISC_R_SUCCESS)
 		return (result);