3 files changed, 7 insertions, 8 deletions
diff --git a/src/core/lib/iomgr/closure.h b/src/core/lib/iomgr/closure.h
index f68918875a..63843ad76d 100644
--- a/src/core/lib/iomgr/closure.h
+++ b/src/core/lib/iomgr/closure.h
@@ -162,7 +162,7 @@ bool grpc_closure_list_empty(grpc_closure_list list);
 void grpc_closure_run(const char* file, int line, grpc_closure* closure,
                       grpc_error* error);
 #define GRPC_CLOSURE_RUN(closure, error) \
-  grpc_closure_run(__FILE__, __LINE__, exec_ctx, closure, error)
+  grpc_closure_run(__FILE__, __LINE__, closure, error)
 #else
 void grpc_closure_run(grpc_closure* closure, grpc_error* error);
 #define GRPC_CLOSURE_RUN(closure, error) grpc_closure_run(closure, error)
diff --git a/src/core/lib/iomgr/tcp_server_uv.cc b/src/core/lib/iomgr/tcp_server_uv.cc
index 2116ec106c..71226600da 100644
--- a/src/core/lib/iomgr/tcp_server_uv.cc
+++ b/src/core/lib/iomgr/tcp_server_uv.cc
@@ -176,13 +176,13 @@ void grpc_tcp_server_unref(grpc_tcp_server* s) {
   if (gpr_unref(&s->refs)) {
     /* Complete shutdown_starting work before destroying. */
     grpc_exec_ctx local_ExecCtx _local_exec_ctx;
-    GRPC_CLOSURE_LIST_SCHED(&local_exec_ctx, &s->shutdown_starting);
+    GRPC_CLOSURE_LIST_SCHED(&s->shutdown_starting);
     if (exec_ctx == NULL) {
-      grpc_exec_ctx_flush(&local_exec_ctx);
-      tcp_server_destroy(&local_exec_ctx, s);
-      grpc_exec_ctx_finish(&local_exec_ctx);
+      grpc_exec_ctx_flush();
+      tcp_server_destroy(s);
+      grpc_exec_ctx_finish();
     } else {
-      grpc_exec_ctx_finish(&local_exec_ctx);
+      grpc_exec_ctx_finish();
       tcp_server_destroy(s);
     }
   }
diff --git a/src/core/lib/iomgr/tcp_uv.cc b/src/core/lib/iomgr/tcp_uv.cc
index 9f2e1f7978..571c1d6f9a 100644
--- a/src/core/lib/iomgr/tcp_uv.cc
+++ b/src/core/lib/iomgr/tcp_uv.cc
@@ -301,8 +301,7 @@ static void uv_add_to_pollset_set(grpc_endpoint* ep,
   (void)pollset;
 }
 
-static void uv_delete_from_pollset_set(grpc_exec_ctx* exec_ctx,
-                                       grpc_endpoint* ep,
+static void uv_delete_from_pollset_set(grpc_endpoint* ep,
                                        grpc_pollset_set* pollset) {
   // No-op. We're ignoring pollsets currently
   (void)exec_ctx;