diff --git a/src/client/event_handler.rs b/src/client/event_handler.rs
index 22ae3a1dee0..ee3debbfb56 100644
--- a/src/client/event_handler.rs
+++ b/src/client/event_handler.rs
@@ -21,7 +21,7 @@ macro_rules! event_handler {
                 $( #[deprecated = $deprecated] )?
                 async fn $method_name(&self, $($context: Context,)? $( $arg_name: $arg_type ),*) {
                     // Suppress unused argument warnings
-                    drop(( $($context,)? $($arg_name),* ))
+                    drop(( $($context,)? $($arg_name,)* ))
                 }
             )*
         }
diff --git a/src/gateway/bridge/shard_queuer.rs b/src/gateway/bridge/shard_queuer.rs
index 969623a7aca..1827a6c15b6 100644
--- a/src/gateway/bridge/shard_queuer.rs
+++ b/src/gateway/bridge/shard_queuer.rs
@@ -137,14 +137,9 @@ impl ShardQueuer {
         // We must wait 5 seconds between IDENTIFYs to avoid session invalidations.
         let duration = Duration::from_secs(WAIT_BETWEEN_BOOTS_IN_SECONDS);
         let elapsed = instant.elapsed();
-
-        if elapsed >= duration {
-            return;
+        if let Some(to_sleep) = duration.checked_sub(elapsed) {
+            sleep(to_sleep).await;
         }
-
-        let to_sleep = duration - elapsed;
-
-        sleep(to_sleep).await;
     }
 
     #[instrument(skip(self))]