diff --git a/src/objects/descriptor-array.h b/src/objects/descriptor-array.h
index 86e5499d89..cb5df27df2 100644
--- a/src/objects/descriptor-array.h
+++ b/src/objects/descriptor-array.h
@@ -219,10 +219,6 @@ class DescriptorArray : public HeapObject {
   inline void SetValue(int descriptor_number, MaybeObject value);
   inline void SetDetails(int descriptor_number, PropertyDetails details);
 
-  //  inline int length() const;
-  //  inline MaybeObject get(int index) const;
-  //  inline void set(int index, MaybeObject value);
-
   // Transfer a complete descriptor from the src descriptor array to this
   // descriptor array.
   void CopyFrom(int index, DescriptorArray src);
diff --git a/src/objects/object-macros.h b/src/objects/object-macros.h
index 4f715af2e0..a3772dee07 100644
--- a/src/objects/object-macros.h
+++ b/src/objects/object-macros.h
@@ -127,7 +127,6 @@
     } else {                                                          \
       TaggedField<type, offset>::store(*this, value);                 \
     }                                                                 \
-    TaggedField<type, offset>::store(*this, value);                   \
     CONDITIONAL_WRITE_BARRIER(*this, offset, value, mode);            \
   }
 
@@ -181,15 +180,19 @@
   WEAK_ACCESSORS_CHECKED(holder, name, offset, true)
 
 // Getter that returns a Smi as an int and writes an int as a Smi.
-#define SMI_ACCESSORS_CHECKED(holder, name, offset, condition)   \
-  int holder::name() const {                                     \
-    DCHECK(condition);                                           \
-    Smi value = TaggedField<Smi, offset>::load(*this);           \
-    return value.value();                                        \
-  }                                                              \
-  void holder::set_##name(int value) {                           \
-    DCHECK(condition);                                           \
-    TaggedField<Smi, offset>::store(*this, Smi::FromInt(value)); \
+#define SMI_ACCESSORS_CHECKED(holder, name, offset, condition)             \
+  int holder::name() const {                                               \
+    DCHECK(condition);                                                     \
+    Smi value = TaggedField<Smi, offset>::load(*this);                     \
+    return value.value();                                                  \
+  }                                                                        \
+  void holder::set_##name(int value) {                                     \
+    DCHECK(condition);                                                     \
+    if (V8_CONCURRENT_MARKING_BOOL) {                                      \
+      TaggedField<Smi, offset>::Relaxed_Store(*this, Smi::FromInt(value)); \
+    } else {                                                               \
+      TaggedField<Smi, offset>::store(*this, Smi::FromInt(value));         \
+    }                                                                      \
   }
 
 #define SMI_ACCESSORS(holder, name, offset) \