Index: routest.c
===================================================================
--- routest.c	(revision 26939)
+++ routest.c	(revision 26940)
@@ -109,8 +109,8 @@
 			if (rst.sub.dlg[rst.wlab[n]].val.lng != hv.lng)
 				pcb_gui->attr_dlg_set_value(rst.sub.dlg_hid_ctx, rst.wchk[n], &hv);
 
-			hv.str_value = PCB->RouteStyle.array[n].name;
-			if (strcmp(rst.sub.dlg[rst.wlab[n]].name, hv.str_value) != 0)
+			hv.str = PCB->RouteStyle.array[n].name;
+			if (strcmp(rst.sub.dlg[rst.wlab[n]].name, hv.str) != 0)
 				pcb_gui->attr_dlg_set_value(rst.sub.dlg_hid_ctx, rst.wlab[n], &hv);
 		}
 		if (vtroutestyle_len(&PCB->RouteStyle) != rst.last_len) {
Index: routest_dlg.c
===================================================================
--- routest_dlg.c	(revision 26939)
+++ routest_dlg.c	(revision 26940)
@@ -73,7 +73,7 @@
 
 	rst = vtroutestyle_get(&PCB->RouteStyle, rst_idx, 0);
 
-	hv.str_value = rst->name;
+	hv.str = rst->name;
 	pcb_gui->attr_dlg_set_value(rstdlg_ctx.dlg_hid_ctx, rstdlg_ctx.wname, &hv);
 
 	hv.coord_value = rst->Thick;
@@ -127,7 +127,7 @@
 TODO("This change is not undoable");
 
 	if (idx == rstdlg_ctx.wname) {
-		const char *s = attr->val.str_value;
+		const char *s = attr->val.str;
 		while(isspace(*s)) s++;
 		strncpy(rst->name, s, sizeof(rst->name));
 	}
@@ -176,8 +176,8 @@
 	PCB_DAD_NEW("route_style_attr", dlg, "Edit route style attribute", NULL, pcb_true, NULL);
 	res = PCB_DAD_RUN(dlg);
 	if (res == 0) {
-		*key = pcb_strdup(dlg[wkey].val.str_value);
-		*val = pcb_strdup(dlg[wval].val.str_value);
+		*key = pcb_strdup(dlg[wkey].val.str);
+		*val = pcb_strdup(dlg[wval].val.str);
 	}
 	PCB_DAD_FREE(dlg);
 	return res;
Index: status.c
===================================================================
--- status.c	(revision 26939)
+++ status.c	(revision 26940)
@@ -143,13 +143,13 @@
 		build_st_line2();
 		pcb_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wst2, 1);
 	}
-	hv.str_value = status.buf.array;
+	hv.str = status.buf.array;
 	pcb_gui->attr_dlg_set_value(status.stsub.dlg_hid_ctx, status.wst1, &hv);
 
 	if (conf_core.appearance.compact) {
 		status.buf.used = 0;
 		build_st_line2();
-		hv.str_value = status.buf.array;
+		hv.str = status.buf.array;
 		pcb_gui->attr_dlg_set_value(status.stsub.dlg_hid_ctx, status.wst2, &hv);
 		if (!status.st_has_text)
 			pcb_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wst2, 0);
@@ -174,12 +174,12 @@
 	if (conf_core.appearance.compact) {
 		status.buf.used = 0;
 		pcb_append_printf(&status.buf, "%m+%-mS", pcbhl_conf.editor.grid_unit->allow, pcb_crosshair.X);
-		hv.str_value = status.buf.array;
+		hv.str = status.buf.array;
 		pcb_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd2[0], &hv);
 
 		status.buf.used = 0;
 		pcb_append_printf(&status.buf, "%m+%-mS", pcbhl_conf.editor.grid_unit->allow, pcb_crosshair.Y);
-		hv.str_value = status.buf.array;
+		hv.str = status.buf.array;
 		pcb_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd2[1], &hv);
 		pcb_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd2[1], 0);
 	}
@@ -186,7 +186,7 @@
 	else {
 		status.buf.used = 0;
 		pcb_append_printf(&status.buf, "%m+%-mS %-mS", pcbhl_conf.editor.grid_unit->allow, pcb_crosshair.X, pcb_crosshair.Y);
-		hv.str_value = status.buf.array;
+		hv.str = status.buf.array;
 		pcb_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd2[0], &hv);
 		pcb_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd2[1], 1);
 	}
@@ -215,12 +215,12 @@
 		s3 = status.buf.array + 17;
 	}
 
-	hv.str_value = s1;
+	hv.str = s1;
 	pcb_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd1[0], &hv);
 	if (conf_core.appearance.compact) {
-		hv.str_value = s2;
+		hv.str = s2;
 		pcb_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd1[1], &hv);
-		hv.str_value = s3;
+		hv.str = s3;
 		pcb_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd1[2], &hv);
 		pcb_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd1[1], 0);
 		pcb_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd1[2], 0);
@@ -233,7 +233,7 @@
 	if (status.last_unit != pcbhl_conf.editor.grid_unit) {
 		status.lock++;
 		status.last_unit = pcbhl_conf.editor.grid_unit;
-		hv.str_value = pcbhl_conf.editor.grid_unit->suffix;
+		hv.str = pcbhl_conf.editor.grid_unit->suffix;
 		pcb_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrdunit, &hv);
 		status.lock--;
 	}
@@ -352,9 +352,9 @@
 
 	if (text != NULL) {
 		pcb_hid_attr_val_t hv;
-		hv.str_value = text;
+		hv.str = text;
 		pcb_gui->attr_dlg_set_value(status.stsub.dlg_hid_ctx, status.wsttxt, &hv);
-		hv.str_value = "";
+		hv.str = "";
 		pcb_gui->attr_dlg_set_value(status.stsub.dlg_hid_ctx, status.wst2, &hv);
 		pcb_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wst1, 1);
 		pcb_gui->attr_dlg_widget_hide(status.stsub.dlg_hid_ctx, status.wsttxt, 0);