Index: eps.c
===================================================================
--- eps.c	(revision 26939)
+++ eps.c	(revision 26940)
@@ -121,7 +121,7 @@
 
 static pcb_export_opt_t *eps_get_export_options(pcb_hid_t *hid, int *n)
 {
-	if ((PCB != NULL)  && (eps_attribute_list[HA_psfile].default_val.str_value == NULL))
+	if ((PCB != NULL)  && (eps_attribute_list[HA_psfile].default_val.str == NULL))
 		pcb_derive_default_filename(PCB->hidlib.filename, &eps_attribute_list[HA_psfile], ".eps");
 
 	if (n)
@@ -326,9 +326,9 @@
 		options = eps_values;
 	}
 
-	pcb_cam_begin(PCB, &eps_cam, options[HA_cam].str_value, eps_attribute_list, NUM_OPTIONS, options);
+	pcb_cam_begin(PCB, &eps_cam, options[HA_cam].str, eps_attribute_list, NUM_OPTIONS, options);
 
-	filename = options[HA_psfile].str_value;
+	filename = options[HA_psfile].str;
 	if (!filename)
 		filename = "pcb-out.eps";
 
@@ -351,7 +351,7 @@
 	fclose(f);
 
 	if (pcb_cam_end(&eps_cam) == 0)
-		pcb_message(PCB_MSG_ERROR, "eps cam export for '%s' failed to produce any content\n", options[HA_cam].str_value);
+		pcb_message(PCB_MSG_ERROR, "eps cam export for '%s' failed to produce any content\n", options[HA_cam].str);
 }
 
 static int eps_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv)
Index: ps.c
===================================================================
--- ps.c	(revision 26939)
+++ ps.c	(revision 26940)
@@ -341,7 +341,7 @@
 
 static pcb_export_opt_t *ps_get_export_options(pcb_hid_t *hid, int *n)
 {
-	if ((PCB != NULL) && (ps_attribute_list[HA_psfile].default_val.str_value == NULL))
+	if ((PCB != NULL) && (ps_attribute_list[HA_psfile].default_val.str == NULL))
 		pcb_derive_default_filename(PCB->hidlib.filename, &ps_attribute_list[HA_psfile], ".ps");
 
 	if (n)
@@ -619,9 +619,9 @@
 		options = global.ps_values;
 	}
 
-	pcb_cam_begin(PCB, &ps_cam, options[HA_cam].str_value, ps_attribute_list, NUM_OPTIONS, options);
+	pcb_cam_begin(PCB, &ps_cam, options[HA_cam].str, ps_attribute_list, NUM_OPTIONS, options);
 
-	global.filename = options[HA_psfile].str_value;
+	global.filename = options[HA_psfile].str;
 	if (!global.filename)
 		global.filename = "pcb-out.ps";
 
@@ -659,7 +659,7 @@
 	}
 
 	if (pcb_cam_end(&ps_cam) == 0)
-		pcb_message(PCB_MSG_ERROR, "eps cam export for '%s' failed to produce any content\n", options[HA_cam].str_value);
+		pcb_message(PCB_MSG_ERROR, "eps cam export for '%s' failed to produce any content\n", options[HA_cam].str);
 }
 
 static int ps_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv)
@@ -1354,18 +1354,18 @@
 		return;
 	}
 
-	if (ps_calib_attribute_list[0].val.str_value == NULL) {
-		ps_calib_attribute_list[0].val.str_value = pcb_strdup("lpr");
+	if (ps_calib_attribute_list[0].val.str == NULL) {
+		ps_calib_attribute_list[0].val.str = pcb_strdup("lpr");
 	}
 
 	if (pcb_attribute_dialog("ps_calibrate", ps_calib_attribute_list, 1, vals, "Print Calibration Page", NULL))
 		return;
 
-	if (vals[0].str_value == NULL)
+	if (vals[0].str == NULL)
 		return;
 
-	if (use_command || strchr(vals[0].str_value, '|')) {
-		const char *cmd = vals[0].str_value;
+	if (use_command || strchr(vals[0].str, '|')) {
+		const char *cmd = vals[0].str;
 		while (*cmd == ' ' || *cmd == '|')
 			cmd++;
 		ps_cal_file = pcb_popen(&PCB->hidlib, cmd, "w");
@@ -1372,7 +1372,7 @@
 		used_popen = 1;
 	}
 	else
-		ps_cal_file = pcb_fopen(&PCB->hidlib, vals[0].str_value, "w");
+		ps_cal_file = pcb_fopen(&PCB->hidlib, vals[0].str, "w");
 
 	for (c = 0; calib_lines[c]; c++)
 		fputs(calib_lines[c], ps_cal_file);