Index: act_geo.c
===================================================================
--- act_geo.c	(revision 30899)
+++ act_geo.c	(revision 30900)
@@ -42,10 +42,10 @@
 	pcb_idpath_t *idp;
 	pcb_any_obj_t *obj;
 
-	PCB_ACT_CONVARG(1, FGW_COORD, IsPointOnLine, x = fgw_coord(&argv[1]));
-	PCB_ACT_CONVARG(2, FGW_COORD, IsPointOnLine, y = fgw_coord(&argv[2]));
-	PCB_ACT_CONVARG(3, FGW_COORD, IsPointOnLine, r = fgw_coord(&argv[3]));
-	PCB_ACT_CONVARG(4, FGW_IDPATH, IsPointOnLine, idp = fgw_idpath(&argv[4]));
+	RND_PCB_ACT_CONVARG(1, FGW_COORD, IsPointOnLine, x = fgw_coord(&argv[1]));
+	RND_PCB_ACT_CONVARG(2, FGW_COORD, IsPointOnLine, y = fgw_coord(&argv[2]));
+	RND_PCB_ACT_CONVARG(3, FGW_COORD, IsPointOnLine, r = fgw_coord(&argv[3]));
+	RND_PCB_ACT_CONVARG(4, FGW_IDPATH, IsPointOnLine, idp = fgw_idpath(&argv[4]));
 	if ((idp == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[4], RND_PTR_DOMAIN_IDPATH))
 		return FGW_ERR_PTR_DOMAIN;
 	obj = pcb_idpath2obj(PCB, idp);
@@ -52,7 +52,7 @@
 	if ((obj == NULL) || (obj->type != PCB_OBJ_LINE))
 		return FGW_ERR_ARG_CONV;
 
-	PCB_ACT_IRES(pcb_is_point_on_line(x, y, r, (pcb_line_t *)obj));
+	RND_ACT_IRES(pcb_is_point_on_line(x, y, r, (pcb_line_t *)obj));
 	return 0;
 }
 
@@ -65,10 +65,10 @@
 	pcb_idpath_t *idp;
 	pcb_any_obj_t *obj;
 
-	PCB_ACT_CONVARG(1, FGW_COORD, IsPointOnArc, x = fgw_coord(&argv[1]));
-	PCB_ACT_CONVARG(2, FGW_COORD, IsPointOnArc, y = fgw_coord(&argv[2]));
-	PCB_ACT_CONVARG(3, FGW_COORD, IsPointOnArc, r = fgw_coord(&argv[3]));
-	PCB_ACT_CONVARG(4, FGW_IDPATH, IsPointOnArc, idp = fgw_idpath(&argv[4]));
+	RND_PCB_ACT_CONVARG(1, FGW_COORD, IsPointOnArc, x = fgw_coord(&argv[1]));
+	RND_PCB_ACT_CONVARG(2, FGW_COORD, IsPointOnArc, y = fgw_coord(&argv[2]));
+	RND_PCB_ACT_CONVARG(3, FGW_COORD, IsPointOnArc, r = fgw_coord(&argv[3]));
+	RND_PCB_ACT_CONVARG(4, FGW_IDPATH, IsPointOnArc, idp = fgw_idpath(&argv[4]));
 	if ((idp == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[4], RND_PTR_DOMAIN_IDPATH))
 		return FGW_ERR_PTR_DOMAIN;
 	obj = pcb_idpath2obj(PCB, idp);
@@ -75,7 +75,7 @@
 	if ((obj == NULL) || (obj->type != PCB_OBJ_ARC))
 		return FGW_ERR_ARG_CONV;
 
-	PCB_ACT_IRES(pcb_is_point_on_arc(x, y, r, (pcb_arc_t *)obj));
+	RND_ACT_IRES(pcb_is_point_on_arc(x, y, r, (pcb_arc_t *)obj));
 	return 0;
 }
 
@@ -87,8 +87,8 @@
 	pcb_idpath_t *idp1, *idp2;
 	pcb_any_obj_t *obj1, *obj2;
 
-	PCB_ACT_CONVARG(1, FGW_IDPATH, IntersectObjObj, idp1 = fgw_idpath(&argv[1]));
-	PCB_ACT_CONVARG(2, FGW_IDPATH, IntersectObjObj, idp2 = fgw_idpath(&argv[2]));
+	RND_PCB_ACT_CONVARG(1, FGW_IDPATH, IntersectObjObj, idp1 = fgw_idpath(&argv[1]));
+	RND_PCB_ACT_CONVARG(2, FGW_IDPATH, IntersectObjObj, idp2 = fgw_idpath(&argv[2]));
 	if ((idp1 == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[1], RND_PTR_DOMAIN_IDPATH))
 		return FGW_ERR_PTR_DOMAIN;
 	if ((idp2 == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH))
@@ -98,7 +98,7 @@
 	if ((obj1 == NULL) || ((obj1->type & PCB_OBJ_CLASS_REAL) == 0) || (obj2 == NULL) || ((obj2->type & PCB_OBJ_CLASS_REAL) == 0))
 		return FGW_ERR_ARG_CONV;
 
-	PCB_ACT_IRES(pcb_intersect_obj_obj(pcb_find0, obj1, obj2));
+	RND_ACT_IRES(pcb_intersect_obj_obj(pcb_find0, obj1, obj2));
 	return 0;
 }
 
Index: act_idpath.c
===================================================================
--- act_idpath.c	(revision 30899)
+++ act_idpath.c	(revision 30900)
@@ -41,7 +41,7 @@
 	int cmd;
 	long idx;
 
-	PCB_ACT_CONVARG(1, FGW_STR, IDPList, cmd_ = argv[1].val.str);
+	RND_PCB_ACT_CONVARG(1, FGW_STR, IDPList, cmd_ = argv[1].val.str);
 
 	cmd = act_read_keywords_sphash(cmd_);
 	if (cmd == act_read_keywords_alloc) {
@@ -49,7 +49,7 @@
 		fgw_ptr_reg(&rnd_fgw, res, RND_PTR_DOMAIN_IDPATH_LIST, FGW_PTR | FGW_STRUCT, list);
 		return 0;
 	}
-	PCB_ACT_CONVARG(2, FGW_IDPATH_LIST, IDPList, list = fgw_idpath_list(&argv[2]));
+	RND_PCB_ACT_CONVARG(2, FGW_IDPATH_LIST, IDPList, list = fgw_idpath_list(&argv[2]));
 
 	if (!fgw_ptr_in_domain(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH_LIST))
 		return FGW_ERR_PTR_DOMAIN;
@@ -57,11 +57,11 @@
 	switch(cmd) {
 		case act_read_keywords_clear:
 			pcb_idpath_list_clear(list);
-			PCB_ACT_IRES(0);
+			RND_ACT_IRES(0);
 			return 0;
 
 		case act_read_keywords_length:
-			PCB_ACT_IRES(pcb_idpath_list_length(list));
+			RND_ACT_IRES(pcb_idpath_list_length(list));
 			return 0;
 
 		case act_read_keywords_free:
@@ -68,13 +68,13 @@
 			fgw_ptr_unreg(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH_LIST);
 			pcb_idpath_list_clear(list);
 			free(list);
-			PCB_ACT_IRES(0);
+			RND_ACT_IRES(0);
 			return 0;
 
 		case act_read_keywords_append:
 		case act_read_keywords_push:
 		case act_read_keywords_prepend:
-			PCB_ACT_CONVARG(3, FGW_IDPATH, IDPList, idp = fgw_idpath(&argv[3]));
+			RND_PCB_ACT_CONVARG(3, FGW_IDPATH, IDPList, idp = fgw_idpath(&argv[3]));
 			if (!fgw_ptr_in_domain(&rnd_fgw, &argv[3], RND_PTR_DOMAIN_IDPATH))
 				return FGW_ERR_PTR_DOMAIN;
 			if (cmd == act_read_keywords_append)
@@ -81,22 +81,22 @@
 				pcb_idpath_list_append(list, idp);
 			else /* prepend or push */
 				pcb_idpath_list_insert(list, idp);
-			PCB_ACT_IRES(0);
+			RND_ACT_IRES(0);
 			return 0;
 
 		case act_read_keywords_remove:
-			PCB_ACT_CONVARG(3, FGW_LONG, IDPList, idx = argv[3].val.nat_long);
+			RND_PCB_ACT_CONVARG(3, FGW_LONG, IDPList, idx = argv[3].val.nat_long);
 			idp = pcb_idpath_list_nth(list, idx);
 			if (idp == NULL) {
-				PCB_ACT_IRES(-1);
+				RND_ACT_IRES(-1);
 				return 0;
 			}
 			pcb_idpath_list_remove(idp);
-			PCB_ACT_IRES(0);
+			RND_ACT_IRES(0);
 			return 0;
 
 		case act_read_keywords_get:
-			PCB_ACT_CONVARG(3, FGW_LONG, IDPList, idx = argv[3].val.nat_long);
+			RND_PCB_ACT_CONVARG(3, FGW_LONG, IDPList, idx = argv[3].val.nat_long);
 			idp = pcb_idpath_list_nth(list, idx);
 			if (idp == NULL) {
 				res->type = FGW_PTR;
@@ -133,8 +133,8 @@
 	pcb_idpath_t *idp;
 	pcb_any_obj_t *obj;
 
-	PCB_ACT_CONVARG(1, FGW_STR, IDP, cmd = argv[1].val.str);
-	PCB_ACT_CONVARG(2, FGW_IDPATH, IDPList, idp = fgw_idpath(&argv[2]));
+	RND_PCB_ACT_CONVARG(1, FGW_STR, IDP, cmd = argv[1].val.str);
+	RND_PCB_ACT_CONVARG(2, FGW_IDPATH, IDPList, idp = fgw_idpath(&argv[2]));
 	if ((idp == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH))
 		return FGW_ERR_PTR_DOMAIN;
 
@@ -144,7 +144,7 @@
 			pcb_idpath_list_remove(idp);
 			fgw_ptr_unreg(&rnd_fgw, &argv[2], RND_PTR_DOMAIN_IDPATH);
 			free(idp);
-			PCB_ACT_IRES(0);
+			RND_ACT_IRES(0);
 			return 0;
 
 		case act_read_keywords_dup:
@@ -176,11 +176,11 @@
 	res->val.ptr_void = NULL;
 
 	if (argc > 2) {
-		PCB_ACT_CONVARG(1, FGW_DATA, GetParentData, root_data = fgw_data(&argv[1]));
+		RND_PCB_ACT_CONVARG(1, FGW_DATA, GetParentData, root_data = fgw_data(&argv[1]));
 		iidx++;
 	}
 
-	PCB_ACT_CONVARG(iidx, FGW_IDPATH, IDPList, idp = fgw_idpath(&argv[iidx]));
+	RND_PCB_ACT_CONVARG(iidx, FGW_IDPATH, IDPList, idp = fgw_idpath(&argv[iidx]));
 	if ((idp == NULL) || !fgw_ptr_in_domain(&rnd_fgw, &argv[iidx], RND_PTR_DOMAIN_IDPATH))
 		return FGW_ERR_PTR_DOMAIN;
 
Index: act_layer.c
===================================================================
--- act_layer.c	(revision 30899)
+++ act_layer.c	(revision 30900)
@@ -61,7 +61,7 @@
 	pcb_layer_type_t lyt;
 	long idx;
 
-	PCB_ACT_CONVARG(1, FGW_STR, ReadGroup, cmds = argv[1].val.str);
+	RND_PCB_ACT_CONVARG(1, FGW_STR, ReadGroup, cmds = argv[1].val.str);
 	cmd = act_read_keywords_sphash(cmds);
 	switch(cmd) {
 		case act_read_keywords_length:
@@ -68,21 +68,21 @@
 			res->type = FGW_LONG; res->val.nat_long = pcb->LayerGroups.len;
 			return 0;
 		case act_read_keywords_layerid:
-			PCB_ACT_CONVARG(2, FGW_LAYERGRPID, ReadGroup, gid = fgw_layergrpid(&argv[2]));
+			RND_PCB_ACT_CONVARG(2, FGW_LAYERGRPID, ReadGroup, gid = fgw_layergrpid(&argv[2]));
 			grp = pcb_get_layergrp(pcb, gid);
 			if (grp == NULL)
 				return FGW_ERR_ARG_CONV;
-			PCB_ACT_CONVARG(3, FGW_LONG, ReadGroup, idx = argv[3].val.nat_long);
+			RND_PCB_ACT_CONVARG(3, FGW_LONG, ReadGroup, idx = argv[3].val.nat_long);
 			if ((idx < 0) || (idx >= grp->len))
 				return FGW_ERR_ARG_CONV;
 			res->type = FGW_LONG; res->val.nat_long = grp->lid[idx];
 			return 0;
 		case act_read_keywords_field:
-			PCB_ACT_CONVARG(2, FGW_LAYERGRPID, ReadGroup, gid = fgw_layergrpid(&argv[2]));
+			RND_PCB_ACT_CONVARG(2, FGW_LAYERGRPID, ReadGroup, gid = fgw_layergrpid(&argv[2]));
 			grp = pcb_get_layergrp(pcb, gid);
 			if (grp == NULL)
 				return FGW_ERR_ARG_CONV;
-			PCB_ACT_CONVARG(3, FGW_STR, ReadGroup, flds = argv[3].val.str);
+			RND_PCB_ACT_CONVARG(3, FGW_STR, ReadGroup, flds = argv[3].val.str);
 			fld = act_read_keywords_sphash(flds);
 			switch(fld) {
 				case act_read_keywords_name:
Index: act_read.c
===================================================================
--- act_read.c	(revision 30899)
+++ act_read.c	(revision 30900)
@@ -51,10 +51,10 @@
 	double v;
 	pcb_bool success;
 
-	PCB_ACT_CONVARG(1, FGW_STR, GetValue, input = argv[1].val.str);
-	PCB_ACT_CONVARG(2, FGW_STR, GetValue, units = argv[2].val.str);
-	PCB_ACT_CONVARG(3, FGW_INT, GetValue, relative = argv[3].val.nat_int);
-	PCB_ACT_CONVARG(4, FGW_STR, GetValue, def_unit = argv[1].val.str);
+	RND_PCB_ACT_CONVARG(1, FGW_STR, GetValue, input = argv[1].val.str);
+	RND_PCB_ACT_CONVARG(2, FGW_STR, GetValue, units = argv[2].val.str);
+	RND_PCB_ACT_CONVARG(3, FGW_INT, GetValue, relative = argv[3].val.nat_int);
+	RND_PCB_ACT_CONVARG(4, FGW_STR, GetValue, def_unit = argv[1].val.str);
 
 	if (*units == '\0')
 		units = NULL;
@@ -74,7 +74,7 @@
 {
 	const char *cmd;
 
-	PCB_ACT_CONVARG(1, FGW_STR, GetMark, cmd = argv[1].val.str);
+	RND_PCB_ACT_CONVARG(1, FGW_STR, GetMark, cmd = argv[1].val.str);
 	switch(*cmd) {
 		case 'a': res->type = FGW_INT; res->val.nat_int = pcb_marked.status; break;
 		case 'u': res->type = FGW_INT; res->val.nat_int = pcb_marked.user_placed; break;
@@ -81,7 +81,7 @@
 		case 'x': res->type = FGW_DOUBLE; res->val.nat_double = pcb_marked.X; break;
 		case 'y': res->type = FGW_DOUBLE; res->val.nat_double = pcb_marked.Y; break;
 		default:
-			PCB_ACT_FAIL(GetMark);
+			RND_ACT_FAIL(GetMark);
 	}
 	return 0;
 }