diff --git a/picoquic/frames.c b/picoquic/frames.c
index 3a9be3acbb70b27441acfa5f393db3fd96eeaa1a..31b0b7e547b53b4be3891c337d6e2e5c37953a0c 100644
--- a/picoquic/frames.c
+++ b/picoquic/frames.c
@@ -912,9 +912,10 @@ picoquic_stream_head* picoquic_find_ready_stream(picoquic_cnx_t* cnx)
 
     while (stream) {
         if ((cnx->maxdata_remote > cnx->data_sent && stream->sent_offset < stream->maxdata_remote &&
-            ((stream->send_queue != NULL && stream->send_queue->length > stream->send_queue->offset) || 
-                (STREAM_SEND_FIN(stream)))) ||
-            STREAM_SEND_RESET(stream) || STREAM_SEND_STOP_SENDING(stream)) {
+            ((stream->send_queue != NULL && stream->send_queue->length > stream->send_queue->offset) ||
+             (stream->fin_requested && !stream->fin_sent))) ||
+            (stream->reset_requested && !stream->reset_sent) ||
+            (stream->stop_sending_requested && !stream->stop_sending_sent)) {
             /* Something can be sent */
             /* if the stream is not active yet, verify that it fits under
              * the max stream id limit */
@@ -948,16 +949,16 @@ int picoquic_prepare_stream_frame(picoquic_cnx_t* cnx, picoquic_stream_head* str
         }
     }
 
-    if (STREAM_SEND_RESET(stream)) {
+    if (stream->reset_requested && !stream->reset_sent) {
         return picoquic_prepare_stream_reset_frame(cnx, stream, bytes, bytes_max, consumed);
     }
 
-    if (STREAM_SEND_STOP_SENDING(stream)) {
+    if (stream->stop_sending_requested && !stream->stop_sending_sent) {
         return picoquic_prepare_stop_sending_frame(stream, bytes, bytes_max, consumed);
     }
 
     if ((stream->send_queue == NULL || stream->send_queue->length <= stream->send_queue->offset) &&
-        (!STREAM_FIN_REQUESTED(stream) || STREAM_FIN_SENT(stream))) {
+        (!stream->fin_requested || stream->fin_sent)) {
         *consumed = 0;
     } else {
         size_t byte_index = 0;
@@ -1043,7 +1044,7 @@ int picoquic_prepare_stream_frame(picoquic_cnx_t* cnx, picoquic_stream_head* str
             }
             *consumed = byte_index;
 
-            if (ret == 0 && STREAM_FIN_REQUESTED(stream) && stream->send_queue == 0) {
+            if (ret == 0 && stream->fin_requested && stream->send_queue == 0) {
                 /* Set the fin bit */
                 stream->fin_sent = 1;
                 bytes[0] |= 1;
diff --git a/picoquic/picoquic_internal.h b/picoquic/picoquic_internal.h
index eb6a982c0b152518c6ebdd6499895b842128ce9d..eaff2bd0205a077408b270cecd9ddb01f1a34c05 100644
--- a/picoquic/picoquic_internal.h
+++ b/picoquic/picoquic_internal.h
@@ -1016,17 +1016,6 @@ int picoquic_receive_transport_extensions(picoquic_cnx_t* cnx, int extension_mod
 
 picoquic_misc_frame_header_t* picoquic_create_misc_frame(const uint8_t* bytes, size_t length);
 
-#define STREAM_RESET_SENT(stream) (stream->reset_sent)
-#define STREAM_RESET_REQUESTED(stream) (stream->reset_requested)
-#define STREAM_SEND_RESET(stream) (STREAM_RESET_REQUESTED(stream) && !STREAM_RESET_SENT(stream))
-#define STREAM_STOP_SENDING_REQUESTED(stream) (stream->stop_sending_requested)
-#define STREAM_STOP_SENDING_SENT(stream) (stream->stop_sending_sent)
-#define STREAM_STOP_SENDING_RECEIVED(stream) (stream->stop_sending_received)
-#define STREAM_SEND_STOP_SENDING(stream) (STREAM_STOP_SENDING_REQUESTED(stream) && !STREAM_STOP_SENDING_SENT(stream))
-#define STREAM_FIN_REQUESTED(stream) (stream->fin_requested)
-#define STREAM_FIN_SENT(stream) (stream->fin_sent)
-#define STREAM_SEND_FIN(stream) (STREAM_FIN_REQUESTED(stream) && !STREAM_FIN_SENT(stream))
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/picoquic/sender.c b/picoquic/sender.c
index 18a804063965ee1f29a5988f5dc668001f116fff..973d52d2a784913569e6d948fdfd1159eebdda4a 100644
--- a/picoquic/sender.c
+++ b/picoquic/sender.c
@@ -86,7 +86,7 @@ int picoquic_add_to_stream(picoquic_cnx_t* cnx, uint64_t stream_id,
     }
 
     /* If our side has sent RST_STREAM or received STOP_SENDING, we should not send anymore data. */
-    if (ret == 0 && (STREAM_RESET_SENT(stream) || STREAM_STOP_SENDING_RECEIVED(stream))) {
+    if (ret == 0 && (stream->reset_sent || stream->stop_sending_received)) {
         ret = -1;
     }