diff --git a/programs/dwgread.c b/programs/dwgread.c
index 215f009306..c7e7a1d53f 100644
--- a/programs/dwgread.c
+++ b/programs/dwgread.c
@@ -267,7 +267,7 @@ main (int argc, char *argv[])
 #ifdef HAVE_VALGRIND_VALGRIND_H
       || (RUNNING_ON_VALGRIND)
 #endif
-     )
+  )
     dwg_free (&dwg);
 
   return error >= DWG_ERR_CRITICAL ? 1 : 0;
diff --git a/src/dec_macros.h b/src/dec_macros.h
index 5e29ec82d8..c3d4856534 100644
--- a/src/dec_macros.h
+++ b/src/dec_macros.h
@@ -226,15 +226,15 @@
 /* preR13 we have no obj->address and obj->size yet, skip VECTOR_CHKCOUNT */
 #define FIELD_TF(nam, len, dxf)                                               \
   {                                                                           \
-    SINCE (R_13) { VECTOR_CHKCOUNT (nam, TF, len) }                           \
-    _obj->nam = bit_read_TF (dat, (int)len);                                  \
+    SINCE (R_13){ VECTOR_CHKCOUNT (nam, TF, len) } _obj->nam                  \
+        = bit_read_TF (dat, (int)len);                                        \
     LOG_INSANE (#nam ": [%d TF " #dxf "]\n", len);                            \
     LOG_INSANE_TF (FIELD_VALUE (nam), (int)len);                              \
   }
 #define FIELD_TFF(nam, len, dxf)                                              \
   {                                                                           \
-    SINCE (R_13) { VECTOR_CHKCOUNT (nam, TF, len) }                           \
-    bit_read_fixed (dat, _obj->nam, (int)len);                                \
+    SINCE (R_13){ VECTOR_CHKCOUNT (nam, TF, len) } bit_read_fixed (           \
+        dat, _obj->nam, (int)len);                                            \
     LOG_INSANE (#nam ": [%d TFF " #dxf "]\n", len);                           \
     LOG_INSANE_TF (FIELD_VALUE (nam), (int)len);                              \
   }
diff --git a/src/decode.c b/src/decode.c
index 4d68ff1430..a74878e314 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -284,7 +284,7 @@ decode_preR13_section (Dwg_Section_Type_r11 id, Bit_Chain *restrict dat,
   if (dwg->num_objects % REFS_PER_REALLOC == 0)
     dwg->object = realloc (dwg->object, old_size + size + REFS_PER_REALLOC);
 
-  // TODO: move to a spec dwg_r11.spec, and dwg_decode_r11_NAME
+    // TODO: move to a spec dwg_r11.spec, and dwg_decode_r11_NAME
 #define PREP_TABLE(token)                                                     \
   Dwg_Object *obj = &dwg->object[num + i];                                    \
   Dwg_Object_##token *_obj = calloc (1, sizeof (Dwg_Object_##token));         \