-static int wr_read_splits (write_case_func *, write_case_data);
-static int wr_output_data (write_case_func *, write_case_data);
-static int wr_read_rowtype (void);
-static int wr_read_factors (void);
-static int wr_read_indeps (void);
-static void matrix_data_read_with_rowtype (write_case_func *,
+static int wr_read_splits (struct wr_aux_data *, struct ccase *,
+ write_case_func *, write_case_data);
+static int wr_output_data (struct wr_aux_data *, struct ccase *,
+ write_case_func *, write_case_data);
+static int wr_read_rowtype (struct wr_aux_data *,
+ const struct matrix_token *, struct dfm_reader *);
+static int wr_read_factors (struct wr_aux_data *);
+static int wr_read_indeps (struct wr_aux_data *);
+static void matrix_data_read_with_rowtype (struct case_source *,
+ struct ccase *,
+ write_case_func *,