diff --git a/GKeyComp.c b/GKeyComp.c
index a6020cb..0aef992 100644
--- a/GKeyComp.c
+++ b/GKeyComp.c
@@ -126,8 +126,6 @@ static bool write_bits(GKeyComp *comp, GKeyParameters *params,
                        unsigned int nbits, unsigned long bits)
 {
   bool success = true;
-  _Optional char *out_buffer;
-  size_t out_size;
 
   assert(comp != NULL);
   assert(params != NULL);
@@ -141,8 +139,8 @@ static bool write_bits(GKeyComp *comp, GKeyParameters *params,
     "GKeyComp: Writing %u bits (0x%lx) to output buffer %p of size %zu\n",
     nbits, bits, params->out_buffer, params->out_size);
 
-  out_buffer = params->out_buffer;
-  out_size = params->out_size;
+  _Optional char *out_buffer = params->out_buffer;
+  size_t out_size = params->out_size;
   size_t out_total = comp->out_total;
 
   unsigned long acc = comp->acc;
diff --git a/GKeyDecomp.c b/GKeyDecomp.c
index 80b730d..b8f7a6f 100644
--- a/GKeyDecomp.c
+++ b/GKeyDecomp.c
@@ -148,8 +148,6 @@ static bool read_bits(GKeyDecomp *decomp, GKeyParameters *params,
                       unsigned int nbits, unsigned long *out)
 {
   bool success = true;
-  const unsigned char *in_buffer;
-  size_t in_size;
 
   assert(decomp != NULL);
   assert(params != NULL);
@@ -159,8 +157,8 @@ static bool read_bits(GKeyDecomp *decomp, GKeyParameters *params,
   DEBUG_VERBOSEF(
     "GKeyDecomp: Reading %u bits from input buffer %p of size %zu\n", nbits,
     params->in_buffer, params->in_size);
-  in_buffer = params->in_buffer;
-  in_size = params->in_size;
+  const unsigned char *in_buffer = params->in_buffer;
+  size_t in_size = params->in_size;
   unsigned long acc = decomp->acc;
   unsigned int acc_nbits = decomp->acc_nbits;
   size_t in_total = decomp->in_total;