#define K(kw, val) #kw, (val),
-/* --- @KW_VALIST@ --- *
+/* --- @K_VALIST@ --- *
*
* Arguments: @va_list ap@ = argument-list extraction state
*
#define K_VALIST(ap) "kw.valist", &(ap),
-/* --- @KW_TAB@ --- *
+/* --- @K_TAB@ --- *
*
* Arguments: @const struct kwval *v@ = base address of argument vector
* @size_t n@ = length of argument vector
* Use: Copies arguments from the source structure @kw@ into the
* vector @v@. The structure @kw@ must have type @struct
* fromset_kwargs *@. The argument @v@ must have type @struct
- * kwval *@ (after array-to- pointer decay), and there must be a
- * variable @v_n@ of sufficiently large integral type suitably
+ * kwval *@ (after array-to-pointer decay), and there must be a
+ * variable @n@ of sufficiently large integral type suitably
* initialized. Elements of the vector, starting with element
* @n@, will be filled in with those keyword arguments defined
* in @toset@ -- which must be a subset of @srcsrc@ from @kw@