diff --git a/src/Buffer.h b/src/Buffer.h
index 3900f986f..6fbc7180a 100644
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -642,8 +642,7 @@ class MAGNUM_EXPORT Buffer {
 
         /**
          * @brief Set buffer data
-         * @param size      Data size
-         * @param data      Pointer to data
+         * @param data      Data
          * @param usage     %Buffer usage
          * @return Reference to self (for method chaining)
          *
@@ -653,29 +652,19 @@ class MAGNUM_EXPORT Buffer {
          * @see setTargetHint(), @fn_gl{BindBuffer} and @fn_gl{BufferData} or
          *      @fn_gl_extension{NamedBufferData,EXT,direct_state_access}
          */
-        Buffer& setData(GLsizeiptr size, const GLvoid* data, Usage usage) {
-            (this->*dataImplementation)(size, data, usage);
+        Buffer& setData(Containers::ArrayReference<const void> data, Usage usage) {
+            (this->*dataImplementation)(data.size(), data, usage);
             return *this;
         }
 
         /**
          * @brief Set buffer data
-         * @param data      Fixed-size array with data
-         * @param usage     %Buffer usage
-         * @return Reference to self (for method chaining)
-         *
-         * @see setData(GLsizeiptr, const GLvoid*, Usage).
+         * @deprecated Use @ref Magnum::Buffer::setData(Containers::ArrayReference<const void>, Usage) "setData(Containers::ArrayReference<const void>, Usage)"
+         *      instead.
          */
-        #ifdef CORRADE_GCC46_COMPATIBILITY
-        #define size size_ /* With GCC 4.6 it conflicts with size(). WTF. */
-        #endif
-        template<std::size_t size, class T> Buffer& setData(const T(&data)[size], Usage usage) {
-            setData(size*sizeof(T), data, usage);
-            return *this;
+        Buffer& setData(GLsizeiptr size, const GLvoid* data, Usage usage) {
+            return setData({data, std::size_t(size)}, usage);
         }
-        #ifdef CORRADE_GCC46_COMPATIBILITY
-        #undef size
-        #endif
 
         /**
          * @brief Set buffer data
@@ -699,8 +688,7 @@ class MAGNUM_EXPORT Buffer {
         /**
          * @brief Set buffer subdata
          * @param offset    Offset in the buffer
-         * @param size      Data size
-         * @param data      Pointer to data
+         * @param data      Data
          * @return Reference to self (for method chaining)
          *
          * If @extension{EXT,direct_state_access} is not available and the
@@ -709,29 +697,19 @@ class MAGNUM_EXPORT Buffer {
          * @see setTargetHint(), @fn_gl{BindBuffer} and @fn_gl{BufferSubData}
          *      or @fn_gl_extension{NamedBufferSubData,EXT,direct_state_access}
          */
-        Buffer& setSubData(GLintptr offset, GLsizeiptr size, const GLvoid* data) {
-            (this->*subDataImplementation)(offset, size, data);
+        Buffer& setSubData(GLintptr offset, Containers::ArrayReference<const void> data) {
+            (this->*subDataImplementation)(offset, data.size(), data);
             return *this;
         }
 
         /**
          * @brief Set buffer subdata
-         * @param offset    Offset in the buffer
-         * @param data      Fixed-size array with data
-         * @return Reference to self (for method chaining)
-         *
-         * @see setSubData(GLintptr, GLsizeiptr, const GLvoid*)
+         * @deprecated Use @ref Magnum::Buffer::setSubData(GLintptr, Containers::ArrayReference<const void>) "setSubData(GLintptr, Containers::ArrayReference<const void>)"
+         *      instead.
          */
-        #ifdef CORRADE_GCC46_COMPATIBILITY
-        #define size size_ /* With GCC 4.6 it conflicts with size(). WTF. */
-        #endif
-        template<std::size_t size, class T> Buffer& setSubData(GLintptr offset, const T(&data)[size]) {
-            setSubData(offset, size*sizeof(T), data);
-            return *this;
+        Buffer& setSubData(GLintptr offset, GLsizeiptr size, const GLvoid* data) {
+            return setSubData(offset, {data, std::size_t(size)});
         }
-        #ifdef CORRADE_GCC46_COMPATIBILITY
-        #undef size
-        #endif
 
         /**
          * @brief Set buffer subdata