diff --git a/src/win/handle.c b/src/win/handle.c
index d5da22bf..2c3acb79 100644
--- a/src/win/handle.c
+++ b/src/win/handle.c
@@ -40,7 +40,7 @@ int uv_is_active(uv_handle_t* handle) {
 
 
 /* TODO: integrate this with uv_close. */
-static int uv_close_error(uv_handle_t* handle, uv_err_t e) {
+static void uv_close_error(uv_handle_t* handle, uv_err_t e) {
   uv_tcp_t* tcp;
   uv_pipe_t* pipe;
 
@@ -66,7 +66,7 @@ static int uv_close_error(uv_handle_t* handle, uv_err_t e) {
       if (tcp->reqs_pending == 0) {
         uv_want_endgame(handle);
       }
-      return 0;
+      return;
 
     case UV_NAMED_PIPE:
       pipe = (uv_pipe_t*)handle;
@@ -75,38 +75,37 @@ static int uv_close_error(uv_handle_t* handle, uv_err_t e) {
       if (pipe->reqs_pending == 0) {
         uv_want_endgame(handle);
       }
-      return 0;
+      return;
 
     case UV_TIMER:
       uv_timer_stop((uv_timer_t*)handle);
       uv_want_endgame(handle);
-      return 0;
+      return;
 
     case UV_PREPARE:
       uv_prepare_stop((uv_prepare_t*)handle);
       uv_want_endgame(handle);
-      return 0;
+      return;
 
     case UV_CHECK:
       uv_check_stop((uv_check_t*)handle);
       uv_want_endgame(handle);
-      return 0;
+      return;
 
     case UV_IDLE:
       uv_idle_stop((uv_idle_t*)handle);
       uv_want_endgame(handle);
-      return 0;
+      return;
 
     case UV_ASYNC:
       if (!((uv_async_t*)handle)->async_sent) {
         uv_want_endgame(handle);
       }
-      return 0;
+      return;
 
     default:
       /* Not supported */
-      assert(0);
-      return -1;
+      abort();
   }
 }
 
diff --git a/test/test-async.c b/test/test-async.c
index 25898fa4..2a3a1bfa 100644
--- a/test/test-async.c
+++ b/test/test-async.c
@@ -146,8 +146,6 @@ static void async2_cb(uv_handle_t* handle, int status) {
 
 
 static void prepare_cb(uv_prepare_t* handle, int status) {
-  int r;
-
   ASSERT(handle == &prepare_handle);
   ASSERT(status == 0);