@@ -58,11 +58,11 @@
 # define OF_BIGGEST_ALIGNMENT _Alignof(max_align_t)
 #else
 # ifdef __BIGGEST_ALIGNMENT__
 #  define OF_BIGGEST_ALIGNMENT __BIGGEST_ALIGNMENT__
 # else
-#  /* Hopefully no arch needs more than 16 bytes padding */
+#  /* Hopefully no arch needs more than 16 byte alignment */
 #  define OF_BIGGEST_ALIGNMENT 16
 # endif
 #endif
 
 #ifdef __GNUC__
@@ -388,35 +388,35 @@
 		OF_HASH_ADD(hash, (otherCopy >> 16) & 0xFF);	\
 		OF_HASH_ADD(hash, (otherCopy >>  8) & 0xFF);	\
 		OF_HASH_ADD(hash, otherCopy & 0xFF);		\
 	}
 
-static OF_INLINE of_range_t
+static OF_INLINE of_range_t OF_CONST_FUNC
 of_range(size_t start, size_t length)
 {
 	of_range_t range = { start, length };
 
 	return range;
 }
 
-static OF_INLINE of_point_t
+static OF_INLINE of_point_t OF_CONST_FUNC
 of_point(float x, float y)
 {
 	of_point_t point = { x, y };
 
 	return point;
 }
 
-static OF_INLINE of_dimension_t
+static OF_INLINE of_dimension_t OF_CONST_FUNC
 of_dimension(float width, float height)
 {
 	of_dimension_t dimension = { width, height };
 
 	return dimension;
 }
 
-static OF_INLINE of_rectangle_t
+static OF_INLINE of_rectangle_t OF_CONST_FUNC
 of_rectangle(float x, float y, float width, float height)
 {
 	of_rectangle_t rectangle = {
 		of_point(x, y),
 		of_dimension(width, height)