-#define TUPLEITEMINIT(arity, ... ) { \
- .functions = { \
- .hashcode = tupleitem_hashcode, \
- .haskey = tupleitem_haskey, \
- .itemkey = tupleitem_itemkey, \
- .releasekey = tupleitem_releasekey \
- }, \
- .arity = arity, \
- .schema = { __VA_ARGS__ } \
- }
+#define NUMARGS(...) (sizeof((void*[]){__VA_ARGS__})/sizeof(void*))
+
+/**
+ * \brief Create a tuple with the given values.
+ *
+ * This invokes \ref tuple_create to allocate and assign a void*
+ * array with the given values.
+ *
+ * \related tupleschema
+ */
+#define TUPLE(...) tuple_create( NUMARGS(__VA_ARGS__), __VA_ARGS__ )
+
+/**
+ * \brief Create a \ref tupleschema with the given column "types".
+ *
+ * This invokes \ref tupleschema_create to allocate and initialize a
+ * \ref tupleschema for the given columns via the \ref TUPLE macro.
+ *
+ * \related tupleschema
+ */
+#define TUPLESCHEMA(...) \
+ tupleschema_create( NUMARGS( __VA_ARGS__ ), TUPLE( __VA_ARGS__ ) )
+