diff --git a/libraries/AP_Common/AP_Common.h b/libraries/AP_Common/AP_Common.h
index a642e91e78..efbecfd295 100644
--- a/libraries/AP_Common/AP_Common.h
+++ b/libraries/AP_Common/AP_Common.h
@@ -46,15 +46,9 @@
 
 /* Declare and implement const and non-const versions of the array subscript
  * operator. The object is treated as an array of type_ values. */
-#define ARRAY_SUBSCRIPT(type_) \
-inline type_ &operator[](size_t i) \
-{ \
-    return reinterpret_cast<type_ *>(this)[i]; \
-} \
-inline type_ operator[](size_t i) const \
-{ \
-    return reinterpret_cast<const type_ *>(this)[i]; \
-}
+#define DEFINE_BYTE_ARRAY_METHODS                                                                   \
+    inline uint8_t &operator[](size_t i) { return reinterpret_cast<uint8_t *>(this)[i]; }           \
+    inline uint8_t operator[](size_t i) const { return reinterpret_cast<const uint8_t *>(this)[i]; }
 
 #define LOCATION_ALT_MAX_M  83000   // maximum altitude (in meters) that can be fit into Location structure's alt field