Index: trunk/src/board.c
===================================================================
--- trunk/src/board.c	(revision 13664)
+++ trunk/src/board.c	(revision 13665)
@@ -242,7 +242,7 @@
 	free(PCB->Name);
 	PCB->Name = Name;
 	pcb_board_changed(0);
-	return (pcb_true);
+	return pcb_true;
 }
 
 void pcb_board_resize(pcb_coord_t Width, pcb_coord_t Height)
Index: trunk/src/buffer.c
===================================================================
--- trunk/src/buffer.c	(revision 13664)
+++ trunk/src/buffer.c	(revision 13665)
@@ -248,7 +248,7 @@
 		pcb_board_remove(newPCB);
 		Buffer->from_outside = 1;
 		pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL); /* undo the events generated on load */
-		return (pcb_true);
+		return pcb_true;
 	}
 
 	/* release unused memory */
@@ -257,7 +257,7 @@
 		PCB_CLEAR_PARENT(Buffer->Data);
 	pcb_event(PCB_EVENT_LAYERS_CHANGED, NULL); /* undo the events generated on load */
 	Buffer->from_outside = 0;
-	return (pcb_false);
+	return pcb_false;
 }
 
 void pcb_buffer_rotate(pcb_buffer_t *Buffer, pcb_uint8_t Number)
Index: trunk/src/change.c
===================================================================
--- trunk/src/change.c	(revision 13664)
+++ trunk/src/change.c	(revision 13665)
@@ -1052,7 +1052,7 @@
 
 	result = pcb_object_operation(&ChangeNameFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3);
 	pcb_draw();
-	return (result);
+	return result;
 }
 
 /* ---------------------------------------------------------------------------
@@ -1072,7 +1072,7 @@
 
 	result = pcb_object_operation(&ChangePinnumFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3);
 	pcb_draw();
-	return (result);
+	return result;
 }
 
 /* ---------------------------------------------------------------------------
@@ -1088,9 +1088,9 @@
 	if (pcb_object_operation(&ChangeJoinFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL) {
 		pcb_draw();
 		pcb_undo_inc_serial();
-		return (pcb_true);
+		return pcb_true;
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -1106,9 +1106,9 @@
 	if (pcb_object_operation(&SetJoinFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL) {
 		pcb_draw();
 		pcb_undo_inc_serial();
-		return (pcb_true);
+		return pcb_true;
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -1124,9 +1124,9 @@
 	if (pcb_object_operation(&ClrJoinFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL) {
 		pcb_draw();
 		pcb_undo_inc_serial();
-		return (pcb_true);
+		return pcb_true;
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -1142,9 +1142,9 @@
 	if (pcb_object_operation(&ChangeNonetlistFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL) {
 		pcb_draw();
 		pcb_undo_inc_serial();
-		return (pcb_true);
+		return pcb_true;
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -1161,9 +1161,9 @@
 	if (pcb_object_operation(&ChangeSquareFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL) {
 		pcb_draw();
 		pcb_undo_inc_serial();
-		return (pcb_true);
+		return pcb_true;
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -1179,9 +1179,9 @@
 	if (pcb_object_operation(&SetSquareFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL) {
 		pcb_draw();
 		pcb_undo_inc_serial();
-		return (pcb_true);
+		return pcb_true;
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -1197,9 +1197,9 @@
 	if (pcb_object_operation(&ClrSquareFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL) {
 		pcb_draw();
 		pcb_undo_inc_serial();
-		return (pcb_true);
+		return pcb_true;
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -1215,9 +1215,9 @@
 	if (pcb_object_operation(&ChangeOctagonFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL) {
 		pcb_draw();
 		pcb_undo_inc_serial();
-		return (pcb_true);
+		return pcb_true;
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -1233,9 +1233,9 @@
 	if (pcb_object_operation(&SetOctagonFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL) {
 		pcb_draw();
 		pcb_undo_inc_serial();
-		return (pcb_true);
+		return pcb_true;
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -1251,9 +1251,9 @@
 	if (pcb_object_operation(&ClrOctagonFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3) != NULL) {
 		pcb_draw();
 		pcb_undo_inc_serial();
-		return (pcb_true);
+		return pcb_true;
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -1341,7 +1341,7 @@
 		pcb_draw();
 		return (Ptr3);
 	}
-	return (NULL);
+	return NULL;
 }
 
 void pcb_flag_change(pcb_board_t *pcb, pcb_change_flag_t how, pcb_flag_values_t flag, int Type, void *Ptr1, void *Ptr2, void *Ptr3)
Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 13664)
+++ trunk/src/crosshair.c	(revision 13665)
@@ -1483,9 +1483,9 @@
 		/* now move forward again */
 		pcb_crosshair.X = x;
 		pcb_crosshair.Y = z;
-		return (pcb_true);
+		return pcb_true;
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
Index: trunk/src/data.c
===================================================================
--- trunk/src/data.c	(revision 13664)
+++ trunk/src/data.c	(revision 13665)
@@ -311,7 +311,7 @@
 	hasNoObjects &= (elementlist_length(&Data->Element) == 0);
 	for (i = 0; i < Data->LayerN; i++)
 		hasNoObjects = hasNoObjects && pcb_layer_is_empty_(PCB, &(Data->Layer[i]));
-	return (hasNoObjects);
+	return hasNoObjects;
 }
 
 pcb_box_t *pcb_data_bbox(pcb_box_t *out, pcb_data_t *Data, pcb_bool ignore_floaters)
Index: trunk/src/find_deadcode.c
===================================================================
--- trunk/src/find_deadcode.c	(revision 13664)
+++ trunk/src/find_deadcode.c	(revision 13665)
@@ -77,7 +77,7 @@
 	else
 		return pcb_true;
 
-	return (pcb_false);
+	return pcb_false;
 }
 
 static pcb_bool LOTouchesLine(pcb_line_t *Line, pcb_cardinal_t LayerGroup)
@@ -105,17 +105,17 @@
 			if (setjmp(info.env) == 0)
 				pcb_r_search(LAYER_PTR(layer)->line_tree, (pcb_box_t *) & info.line, NULL, LOT_Linecallback, &info, NULL);
 			else
-				return (pcb_true);
+				return pcb_true;
 			if (setjmp(info.env) == 0)
 				pcb_r_search(LAYER_PTR(layer)->arc_tree, (pcb_box_t *) & info.line, NULL, LOT_Arccallback, &info, NULL);
 			else
-				return (pcb_true);
+				return pcb_true;
 
 			/* now check all polygons */
 			polylist_foreach(&(PCB->Data->Layer[layer].Polygon), &it, polygon) {
 				if (!PCB_FLAG_TEST(TheFlag, polygon)
 						&& pcb_is_line_in_poly(Line, polygon))
-					return (pcb_true);
+					return pcb_true;
 			}
 		}
 		else {
@@ -127,7 +127,7 @@
 				return pcb_true;
 		}
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* returns pcb_true if nothing un-found touches the passed line
@@ -138,8 +138,8 @@
 pcb_bool lineClear(pcb_line_t *line, pcb_cardinal_t group)
 {
 	if (LOTouchesLine(line, group))
-		return (pcb_false);
+		return pcb_false;
 	if (PVTouchesLine(line))
-		return (pcb_false);
-	return (pcb_true);
+		return pcb_false;
+	return pcb_true;
 }
Index: trunk/src/find_drc.c
===================================================================
--- trunk/src/find_drc.c	(revision 13664)
+++ trunk/src/find_drc.c	(revision 13665)
@@ -894,7 +894,7 @@
 			free(object_type_list);
 
 			if (!throw_drc_dialog())
-				return (pcb_true);
+				return pcb_true;
 			pcb_undo_inc_serial();
 			pcb_undo(pcb_true);
 		}
@@ -939,7 +939,7 @@
 		User = pcb_false;
 		drc = pcb_false;
 		if (!throw_drc_dialog())
-			return (pcb_true);
+			return pcb_true;
 		pcb_undo_inc_serial();
 		pcb_undo(pcb_true);
 		/* highlight the rest of the encroaching net so it's not reported again */
@@ -956,7 +956,7 @@
 	DumpList();
 	TheFlag = PCB_FLAG_FOUND | PCB_FLAG_SELECTED;
 	pcb_reset_conns(pcb_false);
-	return (pcb_false);
+	return pcb_false;
 }
 
 /*----------------------------------------------------------------------------
Index: trunk/src/find_geo.c
===================================================================
--- trunk/src/find_geo.c	(revision 13664)
+++ trunk/src/find_geo.c	(revision 13665)
@@ -240,7 +240,7 @@
 	/* either end */
 	if ((Point->X == Line->Point1.X && Point->Y == Line->Point1.Y)
 			|| (Point->X == Line->Point2.X && Point->Y == Line->Point2.Y))
-		return (pcb_true);
+		return pcb_true;
 
 	/* middle point */
 	pcb_obj_center((pcb_any_obj_t *)Line, &cx, &cy);
@@ -247,7 +247,7 @@
 	if ((Point->X == cx) && (Point->Y == cy))
 		return pcb_true;
 
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -271,7 +271,7 @@
 	if ((Point->X == cx) && (Point->Y == cy))
 		return pcb_true;
 
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -491,25 +491,25 @@
 	r2 = Radius * l - d;
 	/* projection doesn't even intersect circle when r2 < 0 */
 	if (r2 < 0)
-		return (pcb_false);
+		return pcb_false;
 	/* check the ends of the line in case the projected point */
 	/* of intersection is beyond the line end */
 	if (pcb_is_point_on_arc(Line->Point1.X, Line->Point1.Y, MAX(0.5 * Line->Thickness + Bloat, 0.0), Arc))
-		return (pcb_true);
+		return pcb_true;
 	if (pcb_is_point_on_arc(Line->Point2.X, Line->Point2.Y, MAX(0.5 * Line->Thickness + Bloat, 0.0), Arc))
-		return (pcb_true);
+		return pcb_true;
 	if (l == 0.0)
-		return (pcb_false);
+		return pcb_false;
 	r2 = sqrt(r2);
 	Radius = -(dx * dx1 + dy * dy1);
 	r = (Radius + r2) / l;
 	if (r >= 0 && r <= 1
 			&& pcb_is_point_on_arc(Line->Point1.X + r * dx, Line->Point1.Y + r * dy, MAX(0.5 * Line->Thickness + Bloat, 0.0) + 1, Arc))
-		return (pcb_true);
+		return pcb_true;
 	r = (Radius - r2) / l;
 	if (r >= 0 && r <= 1
 			&& pcb_is_point_on_arc(Line->Point1.X + r * dx, Line->Point1.Y + r * dy, MAX(0.5 * Line->Thickness + Bloat, 0.0) + 1, Arc))
-		return (pcb_true);
+		return pcb_true;
 
 	/* check arc end points */
 	pcb_arc_get_end(Arc, 0, &ex, &ey);
@@ -662,7 +662,7 @@
 					line.Point2.Y = v->point[1];
 					pcb_line_bbox(&line);
 					if (pcb_is_line_in_poly(&line, P2))
-						return (pcb_true);
+						return pcb_true;
 					line.Point1.X = line.Point2.X;
 					line.Point1.Y = line.Point2.Y;
 				}
@@ -670,7 +670,7 @@
 		}
 	}
 
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
Index: trunk/src/find_lookup.c
===================================================================
--- trunk/src/find_lookup.c	(revision 13664)
+++ trunk/src/find_lookup.c	(revision 13665)
@@ -649,10 +649,10 @@
 			for (; *position < RatList.Number; (*position)++) {
 				group = RATLIST_ENTRY(*position)->group1;
 				if (LookupLOConnectionsToRatEnd(&(RATLIST_ENTRY(*position)->Point1), group))
-					return (pcb_true);
+					return pcb_true;
 				group = RATLIST_ENTRY(*position)->group2;
 				if (LookupLOConnectionsToRatEnd(&(RATLIST_ENTRY(*position)->Point2), group))
-					return (pcb_true);
+					return pcb_true;
 			}
 		}
 		/* loop over all layergroups */
@@ -669,19 +669,19 @@
 				position = &lineposition[layer];
 				for (; *position < LineList[layer].Number; (*position)++)
 					if (LookupLOConnectionsToLine(LINELIST_ENTRY(layer, *position), group, pcb_true))
-						return (pcb_true);
+						return pcb_true;
 
 				/* try all new arcs */
 				position = &arcposition[layer];
 				for (; *position < ArcList[layer].Number; (*position)++)
 					if (LookupLOConnectionsToArc(ARCLIST_ENTRY(layer, *position), group))
-						return (pcb_true);
+						return pcb_true;
 
 				/* try all new polygons */
 				position = &polyposition[layer];
 				for (; *position < PolygonList[layer].Number; (*position)++)
 					if (LookupLOConnectionsToPolygon(POLYGONLIST_ENTRY(layer, *position), group))
-						return (pcb_true);
+						return pcb_true;
 			}
 
 			/* try all new pads */
@@ -694,7 +694,7 @@
 			position = &padposition[layer];
 			for (; *position < PadList[layer].Number; (*position)++)
 				if (LookupLOConnectionsToPad(PADLIST_ENTRY(layer, *position), group))
-					return (pcb_true);
+					return pcb_true;
 		}
 
 		/* check if all lists are done; Later for-loops
@@ -711,7 +711,7 @@
 		for (layer = 0; layer < 2; layer++)
 			done = done && padposition[layer] >= PadList[layer].Number;
 	} while (!done);
-	return (pcb_false);
+	return pcb_false;
 }
 
 static pcb_r_dir_t pv_pv_callback(const pcb_box_t * b, void *cl)
@@ -772,7 +772,7 @@
 		PVList.Location++;
 	}
 	PVList.Location = save_place;
-	return (pcb_false);
+	return pcb_false;
 }
 
 struct lo_info {
@@ -1071,7 +1071,7 @@
 			RatList.Location++;
 		}
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 pcb_r_dir_t pv_touch_callback(const pcb_box_t * b, void *cl)
Index: trunk/src/find_misc.c
===================================================================
--- trunk/src/find_misc.c	(revision 13664)
+++ trunk/src/find_misc.c	(revision 13665)
@@ -43,7 +43,7 @@
 	for (i = 0; i < pcb_max_layer && empty; i++)
 		empty = empty && LineList[i].Location >= LineList[i].Number
 			&& ArcList[i].Location >= ArcList[i].Number && PolygonList[i].Location >= PolygonList[i].Number;
-	return (empty);
+	return empty;
 }
 
 static void reassign_no_drc_flags(void)
@@ -79,7 +79,7 @@
 	while (!newone && !ListsEmpty(AndRats));
 	if (AndDraw)
 		pcb_draw();
-	return (newone);
+	return newone;
 }
 
 /* ---------------------------------------------------------------------------
@@ -228,7 +228,7 @@
 	default:
 		assert(!"unhandled object type: can't start a find list from this\n");
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 
Index: trunk/src/find_print.c
===================================================================
--- trunk/src/find_print.c	(revision 13664)
+++ trunk/src/find_print.c	(revision 13665)
@@ -74,7 +74,7 @@
 
 				/* reset found objects for the next pin */
 				if (PrepareNextLoop(FP))
-					return (pcb_true);
+					return pcb_true;
 			}
 		}
 	}
@@ -116,7 +116,7 @@
 
 			/* reset found objects for the next pin */
 			if (PrepareNextLoop(FP))
-				return (pcb_true);
+				return pcb_true;
 		}
 	}
 	PCB_END_LOOP;
@@ -126,7 +126,7 @@
 		fputs("}\n\n", FP);
 		SEPARATE(FP);
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -154,7 +154,7 @@
 	/* reset Padstacks */
 	PadstackList.Number = PadstackList.Location = 0;
 
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -184,7 +184,7 @@
 		PrintPadConnections(PCB_SOLDER_SIDE, FP, pcb_false);
 		fputs("\t}\n", FP);
 		if (PrepareNextLoop(FP))
-			return (pcb_true);
+			return pcb_true;
 	}
 	PCB_END_LOOP;
 
@@ -208,11 +208,11 @@
 		PrintPinConnections(FP, pcb_false);
 		fputs("\t}\n", FP);
 		if (PrepareNextLoop(FP))
-			return (pcb_true);
+			return pcb_true;
 	}
 	PCB_END_LOOP;
 	fputs("}\n\n", FP);
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
Index: trunk/src/misc_util.c
===================================================================
--- trunk/src/misc_util.c	(revision 13664)
+++ trunk/src/misc_util.c	(revision 13665)
@@ -173,7 +173,7 @@
 	size_t length;
 
 	if (!S || !*S)
-		return (NULL);
+		return NULL;
 
 	/* strip leading blanks */
 	for (p1 = S; *p1 && isspace((int) *p1); p1++);
@@ -187,8 +187,8 @@
 		copy = (char *) realloc(NULL, length + 1);
 		strncpy(copy, p1, length);
 		copy[length] = '\0';
-		return (copy);
+		return copy;
 	}
 	else
-		return (NULL);
+		return NULL;
 }
Index: trunk/src/move.c
===================================================================
--- trunk/src/move.c	(revision 13664)
+++ trunk/src/move.c	(revision 13665)
@@ -128,7 +128,7 @@
 	ctx.move.dy = DY;
 	pcb_undo_add_obj_to_move(Type, Ptr1, Ptr2, Ptr3, DX, DY);
 	result = pcb_object_operation(&MoveFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3);
-	return (result);
+	return result;
 }
 
 void *pcb_move_obj_and_rubberband(int Type, void *Ptr1, void *Ptr2, void *Ptr3, pcb_coord_t DX, pcb_coord_t DY)
@@ -251,7 +251,7 @@
 
 	result = pcb_object_operation(&MoveToLayerFunctions, &ctx, Type, Ptr1, Ptr2, Ptr3);
 	pcb_undo_inc_serial();
-	return (result);
+	return result;
 }
 
 pcb_bool pcb_move_selected_objs_to_layer(pcb_layer_t *Target)
Index: trunk/src/obj_arc.c
===================================================================
--- trunk/src/obj_arc.c	(revision 13664)
+++ trunk/src/obj_arc.c	(revision 13665)
@@ -206,7 +206,7 @@
 	{
 		if (arc->X == X1 && arc->Y == Y1 && arc->Width == width &&
 				pcb_normalize_angle(arc->StartAngle) == pcb_normalize_angle(sa) && arc->Delta == dir)
-			return (NULL);						/* prevent stacked arcs */
+			return NULL;						/* prevent stacked arcs */
 	}
 	PCB_END_LOOP;
 	Arc = pcb_arc_alloc(Layer);
@@ -355,7 +355,7 @@
 	pcb_coord_t value = (ctx->chgsize.is_absolute) ? ctx->chgsize.value : Arc->Thickness + ctx->chgsize.value;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc))
-		return (NULL);
+		return NULL;
 	if (value <= PCB_MAX_LINESIZE && value >= PCB_MIN_LINESIZE && value != Arc->Thickness) {
 		pcb_undo_add_obj_to_size(PCB_TYPE_ARC, Layer, Arc, Arc);
 		pcb_arc_invalidate_erase(Arc);
@@ -368,7 +368,7 @@
 		pcb_arc_invalidate_draw(Layer, Arc);
 		return (Arc);
 	}
-	return (NULL);
+	return NULL;
 }
 
 /* changes the clearance size of an arc */
@@ -377,7 +377,7 @@
 	pcb_coord_t value = (ctx->chgsize.is_absolute) ? ctx->chgsize.value : Arc->Clearance + ctx->chgsize.value;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc) || !PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Arc))
-		return (NULL);
+		return NULL;
 	if (value < 0)
 		value = 0;
 	value = MIN(PCB_MAX_LINESIZE, value);
@@ -397,7 +397,7 @@
 		pcb_arc_invalidate_draw(Layer, Arc);
 		return (Arc);
 	}
-	return (NULL);
+	return NULL;
 }
 
 /* changes the radius of an arc (is_primary 0=width or 1=height or 2=both) */
@@ -407,7 +407,7 @@
 	void *a0, *a1;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc))
-		return (NULL);
+		return NULL;
 
 	switch(ctx->chgsize.is_primary) {
 		case 0: dst = &Arc->Width; break;
@@ -434,7 +434,7 @@
 		pcb_arc_invalidate_draw(Layer, Arc);
 		return (Arc);
 	}
-	return (NULL);
+	return NULL;
 }
 
 /* changes the angle of an arc (is_primary 0=start or 1=end) */
@@ -444,7 +444,7 @@
 	void *a0, *a1;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc))
-		return (NULL);
+		return NULL;
 
 	switch(ctx->chgangle.is_primary) {
 		case 0: dst = &Arc->StartAngle; break;
@@ -472,7 +472,7 @@
 		pcb_arc_invalidate_draw(Layer, Arc);
 		return (Arc);
 	}
-	return (NULL);
+	return NULL;
 }
 
 /* changes the clearance flag of an arc */
@@ -479,7 +479,7 @@
 void *pcb_arcop_change_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc))
-		return (NULL);
+		return NULL;
 	pcb_arc_invalidate_erase(Arc);
 	if (PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Arc)) {
 		pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_ARC, Layer, Arc);
@@ -499,7 +499,7 @@
 void *pcb_arcop_set_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc) || PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Arc))
-		return (NULL);
+		return NULL;
 	return pcb_arcop_change_join(ctx, Layer, Arc);
 }
 
@@ -507,7 +507,7 @@
 void *pcb_arcop_clear_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc) || !PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Arc))
-		return (NULL);
+		return NULL;
 	return pcb_arcop_change_join(ctx, Layer, Arc);
 }
 
Index: trunk/src/obj_elem.c
===================================================================
--- trunk/src/obj_elem.c	(revision 13664)
+++ trunk/src/obj_elem.c	(revision 13665)
@@ -157,12 +157,12 @@
 			pcb_subc_t *subc = pcb_subclist_first(&Buffer->Data->subc);
 			pcb_subc_get_origin(subc, &Buffer->X, &Buffer->Y);
 		}
-		return (pcb_true);
+		return pcb_true;
 	}
 
 	/* release memory which might have been acquired */
 	pcb_buffer_clear(PCB, Buffer);
-	return (pcb_false);
+	return pcb_false;
 }
 
 
@@ -183,7 +183,7 @@
 	char tmp[128];
 
 	if (elementlist_length(&Buffer->Data->Element) != 1)
-		return (pcb_false);
+		return pcb_false;
 
 	/*
 	 * At this point the buffer should contain just a single element.
@@ -273,7 +273,7 @@
 	PCB_END_LOOP;
 	pcb_element_destroy(element);
 	pcb_element_free(element);
-	return (pcb_true);
+	return pcb_true;
 }
 
 /* see if a polygon is a rectangle.  If so, canonicalize it. */
@@ -323,7 +323,7 @@
 														 NULL, NULL, NULL, PCB_PASTEBUFFER->X,
 														 PCB_PASTEBUFFER->Y, 0, 100, pcb_flag_make(PCB_SWAP_IDENT ? PCB_FLAG_ONSOLDER : PCB_FLAG_NO), pcb_false);
 	if (!Element)
-		return (pcb_false);
+		return pcb_false;
 	PCB_VIA_LOOP(Buffer->Data);
 	{
 		char num[8];
@@ -423,7 +423,7 @@
 	if (!hasParts) {
 		pcb_destroy_object(PCB->Data, PCB_TYPE_ELEMENT, Element, Element, Element);
 		pcb_message(PCB_MSG_ERROR, _("There was nothing to convert!\n" "Elements must have some silk, pads or pins.\n"));
-		return (pcb_false);
+		return pcb_false;
 	}
 	if (crooked)
 		pcb_message(PCB_MSG_ERROR, _("There were polygons that can't be made into pins!\n" "So they were not included in the element\n"));
@@ -435,7 +435,7 @@
 	pcb_buffer_clear(PCB, Buffer);
 	pcb_move_obj_to_buffer(PCB, Buffer->Data, PCB->Data, PCB_TYPE_ELEMENT, Element, Element, Element);
 	pcb_set_buffer_bbox(Buffer);
-	return (pcb_true);
+	return pcb_true;
 }
 
 void pcb_element_rotate(pcb_data_t *Data, pcb_element_t *Element, pcb_coord_t X, pcb_coord_t Y, double cosa, double sina, pcb_angle_t angle)
@@ -489,12 +489,12 @@
 pcb_bool pcb_element_change_side(pcb_element_t *Element, pcb_coord_t yoff)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Element))
-		return (pcb_false);
+		return pcb_false;
 	pcb_elem_invalidate_erase(Element);
 	pcb_undo_add_obj_to_mirror(PCB_TYPE_ELEMENT, Element, Element, Element, yoff);
 	pcb_element_mirror(PCB->Data, Element, yoff);
 	pcb_elem_invalidate_draw(Element);
-	return (pcb_true);
+	return pcb_true;
 }
 
 /* changes the side of all selected and visible elements;
@@ -1369,7 +1369,7 @@
 	pcb_coord_t value;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Element))
-		return (NULL);
+		return NULL;
 	PCB_PIN_LOOP(Element);
 	{
 		value = (ctx->chgsize.is_absolute) ? ctx->chgsize.value : pin->DrillingHole + ctx->chgsize.value;
@@ -1393,7 +1393,7 @@
 	if (changed)
 		return (Element);
 	else
-		return (NULL);
+		return NULL;
 }
 
 /* changes ring dia of all pins of an element; returns pcb_true if changed */
@@ -1403,7 +1403,7 @@
 	pcb_coord_t value;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Element))
-		return (NULL);
+		return NULL;
 	PCB_PIN_LOOP(Element);
 	{
 		value = (ctx->chgsize.is_absolute) ? ctx->chgsize.value : pin->DrillingHole + ctx->chgsize.value;
@@ -1425,7 +1425,7 @@
 	if (changed)
 		return (Element);
 	else
-		return (NULL);
+		return NULL;
 }
 
 /* changes the clearance of all pins of an element; returns pcb_true if changed */
@@ -1435,7 +1435,7 @@
 	pcb_coord_t value;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Element))
-		return (NULL);
+		return NULL;
 	PCB_PIN_LOOP(Element);
 	{
 		value = (ctx->chgsize.is_absolute) ? ctx->chgsize.value : pin->Clearance + ctx->chgsize.value;
@@ -1483,7 +1483,7 @@
 	if (changed)
 		return (Element);
 	else
-		return (NULL);
+		return NULL;
 }
 
 /* changes the scaling factor of an element's outline; returns pcb_true if changed */
@@ -1493,7 +1493,7 @@
 	pcb_bool changed = pcb_false;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Element))
-		return (NULL);
+		return NULL;
 	if (pcb_silk_on(PCB))
 		pcb_elem_invalidate_erase(Element);
 	PCB_ELEMENT_PCB_LINE_LOOP(Element);
@@ -1521,7 +1521,7 @@
 	}
 	if (changed)
 		return (Element);
-	return (NULL);
+	return NULL;
 }
 
 /* changes the scaling factor of a elementname object; returns pcb_true if changed */
@@ -1531,7 +1531,7 @@
 		: PCB_ELEM_TEXT_DESCRIPTION(Element).Scale + PCB_COORD_TO_MIL(ctx->chgsize.value);
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, &Element->Name[0]))
-		return (NULL);
+		return NULL;
 	if (value <= PCB_MAX_TEXTSCALE && value >= PCB_MIN_TEXTSCALE) {
 		pcb_elem_name_invalidate_erase(Element);
 		PCB_ELEMENT_PCB_TEXT_LOOP(Element);
@@ -1546,7 +1546,7 @@
 		pcb_elem_name_invalidate_draw(Element);
 		return (Element);
 	}
-	return (NULL);
+	return NULL;
 }
 
 
@@ -1553,7 +1553,7 @@
 void *pcb_elemop_change_name(pcb_opctx_t *ctx, pcb_element_t *Element)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, &Element->Name[0]))
-		return (NULL);
+		return NULL;
 	if (PCB_ELEMNAME_IDX_VISIBLE() == PCB_ELEMNAME_IDX_REFDES) {
 		if (conf_core.editor.unique_names && pcb_element_uniq_name(PCB->Data, ctx->chgname.new_name) != ctx->chgname.new_name) {
 			pcb_message(PCB_MSG_ERROR, _("Error: The name \"%s\" is not unique!\n"), ctx->chgname.new_name);
@@ -1567,7 +1567,7 @@
 void *pcb_elemop_change_nonetlist(pcb_opctx_t *ctx, pcb_element_t *Element)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Element))
-		return (NULL);
+		return NULL;
 	PCB_FLAG_TOGGLE(PCB_FLAG_NONETLIST, Element);
 	return Element;
 }
@@ -1579,7 +1579,7 @@
 	void *ans = NULL;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Element))
-		return (NULL);
+		return NULL;
 	PCB_PIN_LOOP(Element);
 	{
 		ans = pcb_pinop_change_square(ctx, Element, pin);
@@ -1599,7 +1599,7 @@
 	void *ans = NULL;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Element))
-		return (NULL);
+		return NULL;
 	PCB_PIN_LOOP(Element);
 	{
 		ans = pcb_pinop_set_square(ctx, Element, pin);
@@ -1619,7 +1619,7 @@
 	void *ans = NULL;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Element))
-		return (NULL);
+		return NULL;
 	PCB_PIN_LOOP(Element);
 	{
 		ans = pcb_pinop_clear_square(ctx, Element, pin);
@@ -1639,7 +1639,7 @@
 	void *result = NULL;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Element))
-		return (NULL);
+		return NULL;
 	PCB_PIN_LOOP(Element);
 	{
 		pcb_pinop_change_octagon(ctx, Element, pin);
@@ -1646,7 +1646,7 @@
 		result = Element;
 	}
 	PCB_END_LOOP;
-	return (result);
+	return result;
 }
 
 /* sets the octagon flags of all pins of an element */
@@ -1655,7 +1655,7 @@
 	void *result = NULL;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Element))
-		return (NULL);
+		return NULL;
 	PCB_PIN_LOOP(Element);
 	{
 		pcb_pinop_set_octagon(ctx, Element, pin);
@@ -1662,7 +1662,7 @@
 		result = Element;
 	}
 	PCB_END_LOOP;
-	return (result);
+	return result;
 }
 
 /* clears the octagon flags of all pins of an element */
@@ -1671,7 +1671,7 @@
 	void *result = NULL;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Element))
-		return (NULL);
+		return NULL;
 	PCB_PIN_LOOP(Element);
 	{
 		pcb_pinop_clear_octagon(ctx, Element, pin);
@@ -1678,7 +1678,7 @@
 		result = Element;
 	}
 	PCB_END_LOOP;
-	return (result);
+	return result;
 }
 
 /* copies an element onto the PCB.  Then does a draw. */
Index: trunk/src/obj_line.c
===================================================================
--- trunk/src/obj_line.c	(revision 13664)
+++ trunk/src/obj_line.c	(revision 13665)
@@ -379,7 +379,7 @@
 	pcb_coord_t value = (ctx->chgsize.is_absolute) ? ctx->chgsize.value : Line->Thickness + ctx->chgsize.value;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Line))
-		return (NULL);
+		return NULL;
 	if (value <= PCB_MAX_LINESIZE && value >= PCB_MIN_LINESIZE && value != Line->Thickness) {
 		pcb_undo_add_obj_to_size(PCB_TYPE_LINE, Layer, Line, Line);
 		pcb_line_invalidate_erase(Line);
@@ -392,7 +392,7 @@
 		pcb_line_invalidate_draw(Layer, Line);
 		return (Line);
 	}
-	return (NULL);
+	return NULL;
 }
 
 /*changes the clearance size of a line */
@@ -401,7 +401,7 @@
 	pcb_coord_t value = (ctx->chgsize.is_absolute) ? ctx->chgsize.value : Line->Clearance + ctx->chgsize.value;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Line) || !PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Line))
-		return (NULL);
+		return NULL;
 	if (value < 0)
 		value = 0;
 	value = MIN(PCB_MAX_LINESIZE, value);
@@ -421,7 +421,7 @@
 		pcb_line_invalidate_draw(Layer, Line);
 		return (Line);
 	}
-	return (NULL);
+	return NULL;
 }
 
 /* changes the name of a line */
@@ -438,7 +438,7 @@
 void *pcb_lineop_change_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Line))
-		return (NULL);
+		return NULL;
 	pcb_line_invalidate_erase(Line);
 	if (PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Line)) {
 		pcb_undo_add_obj_to_clear_poly(PCB_TYPE_LINE, Layer, Line, Line, pcb_false);
@@ -458,7 +458,7 @@
 void *pcb_lineop_set_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Line) || PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Line))
-		return (NULL);
+		return NULL;
 	return pcb_lineop_change_join(ctx, Layer, Line);
 }
 
@@ -466,7 +466,7 @@
 void *pcb_lineop_clear_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_line_t *Line)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Line) || !PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Line))
-		return (NULL);
+		return NULL;
 	return pcb_lineop_change_join(ctx, Layer, Line);
 }
 
@@ -898,7 +898,7 @@
 
 	if (((Line->Point1.X == ctx->insert.x) && (Line->Point1.Y == ctx->insert.y)) ||
 			((Line->Point2.X == ctx->insert.x) && (Line->Point2.Y == ctx->insert.y)))
-		return (NULL);
+		return NULL;
 	X = Line->Point2.X;
 	Y = Line->Point2.Y;
 	pcb_undo_add_obj_to_move(PCB_TYPE_LINE_POINT, Layer, Line, &Line->Point2, ctx->insert.x - X, ctx->insert.y - Y);
Index: trunk/src/obj_pad.c
===================================================================
--- trunk/src/obj_pad.c	(revision 13664)
+++ trunk/src/obj_pad.c	(revision 13665)
@@ -211,13 +211,13 @@
 pcb_bool pcb_pad_change_paste(pcb_pad_t *Pad)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pad))
-		return (pcb_false);
+		return pcb_false;
 	pcb_pad_invalidate_erase(Pad);
 	pcb_undo_add_obj_to_flag(Pad);
 	PCB_FLAG_TOGGLE(PCB_FLAG_NOPASTE, Pad);
 	pcb_pad_invalidate_draw(Pad);
 	pcb_draw();
-	return (pcb_true);
+	return pcb_true;
 }
 
 int pcb_pad_eq(const pcb_element_t *e1, const pcb_pad_t *p1, const pcb_element_t *e2, const pcb_pad_t *p2)
@@ -268,7 +268,7 @@
 	pcb_coord_t value = (ctx->chgsize.is_absolute) ? ctx->chgsize.value : Pad->Thickness + ctx->chgsize.value;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pad))
-		return (NULL);
+		return NULL;
 	if (value <= PCB_MAX_PADSIZE && value >= PCB_MIN_PADSIZE && value != Pad->Thickness) {
 		pcb_undo_add_obj_to_size(PCB_TYPE_PAD, Element, Pad, Pad);
 		pcb_undo_add_obj_to_mask_size(PCB_TYPE_PAD, Element, Pad, Pad);
@@ -283,7 +283,7 @@
 		pcb_pad_invalidate_draw(Pad);
 		return (Pad);
 	}
-	return (NULL);
+	return NULL;
 }
 
 /* changes the clearance size of a pad */
@@ -292,7 +292,7 @@
 	pcb_coord_t value = (ctx->chgsize.is_absolute) ? ctx->chgsize.value : Pad->Clearance + ctx->chgsize.value;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pad))
-		return (NULL);
+		return NULL;
 	if (value < 0)
 		value = 0;
 	else
@@ -351,7 +351,7 @@
 void *pcb_padop_change_square(pcb_opctx_t *ctx, pcb_element_t *Element, pcb_pad_t *Pad)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pad))
-		return (NULL);
+		return NULL;
 	pcb_pad_invalidate_erase(Pad);
 	pcb_undo_add_obj_to_clear_poly(PCB_TYPE_PAD, Element, Pad, Pad, pcb_false);
 	pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_PAD, Element, Pad);
@@ -368,7 +368,7 @@
 {
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pad) || PCB_FLAG_TEST(PCB_FLAG_SQUARE, Pad))
-		return (NULL);
+		return NULL;
 
 	return (pcb_padop_change_square(ctx, Element, Pad));
 }
@@ -379,7 +379,7 @@
 {
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pad) || !PCB_FLAG_TEST(PCB_FLAG_SQUARE, Pad))
-		return (NULL);
+		return NULL;
 
 	return (pcb_padop_change_square(ctx, Element, Pad));
 }
@@ -401,7 +401,7 @@
 		pcb_pad_invalidate_draw(Pad);
 		return (Pad);
 	}
-	return (NULL);
+	return NULL;
 }
 
 void *pcb_padop_change_flag(pcb_opctx_t *ctx, pcb_element_t *elem, pcb_pad_t *pad)
Index: trunk/src/obj_pinvia.c
===================================================================
--- trunk/src/obj_pinvia.c	(revision 13664)
+++ trunk/src/obj_pinvia.c	(revision 13665)
@@ -105,7 +105,7 @@
 			if (pcb_distance(X, Y, via->X, via->Y) <= via->DrillingHole / 2 + DrillingHole / 2) {
 				pcb_message(PCB_MSG_WARNING, _("%m+Dropping via at %$mD because it's hole would overlap with the via "
 									"at %$mD\n"), conf_core.editor.grid_unit->allow, X, Y, via->X, via->Y);
-				return (NULL);					/* don't allow via stacking */
+				return NULL;					/* don't allow via stacking */
 			}
 		}
 		PCB_END_LOOP;
@@ -416,7 +416,7 @@
 	pcb_coord_t value = ctx->chgsize.is_absolute ? ctx->chgsize.value : Via->Thickness + ctx->chgsize.value;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Via))
-		return (NULL);
+		return NULL;
 	if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, Via) && value <= PCB_MAX_PINORVIASIZE &&
 			value >= PCB_MIN_PINORVIASIZE && value >= Via->DrillingHole + PCB_MIN_PINORVIACOPPER && value != Via->Thickness) {
 		pcb_undo_add_obj_to_size(PCB_TYPE_VIA, Via, Via, Via);
@@ -434,7 +434,7 @@
 		pcb_via_invalidate_draw(Via);
 		return (Via);
 	}
-	return (NULL);
+	return NULL;
 }
 
 /* changes the drilling hole of a via */
@@ -443,7 +443,7 @@
 	pcb_coord_t value = (ctx->chgsize.is_absolute) ? ctx->chgsize.value : Via->DrillingHole + ctx->chgsize.value;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Via))
-		return (NULL);
+		return NULL;
 	if (value <= PCB_MAX_PINORVIASIZE &&
 			value >= PCB_MIN_PINORVIAHOLE && (PCB_FLAG_TEST(PCB_FLAG_HOLE, Via) || value <= Via->Thickness - PCB_MIN_PINORVIACOPPER)
 			&& value != Via->DrillingHole) {
@@ -459,7 +459,7 @@
 		pcb_via_invalidate_draw(Via);
 		return (Via);
 	}
-	return (NULL);
+	return NULL;
 }
 
 /* changes the drilling hole of a pin */
@@ -468,7 +468,7 @@
 	pcb_coord_t value = (ctx->chgsize.is_absolute) ? ctx->chgsize.value : Pin->DrillingHole + ctx->chgsize.value;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pin))
-		return (NULL);
+		return NULL;
 	if (value <= PCB_MAX_PINORVIASIZE &&
 			value >= PCB_MIN_PINORVIAHOLE && (PCB_FLAG_TEST(PCB_FLAG_HOLE, Pin) || value <= Pin->Thickness - PCB_MIN_PINORVIACOPPER)
 			&& value != Pin->DrillingHole) {
@@ -484,7 +484,7 @@
 		pcb_pin_invalidate_draw(Pin);
 		return (Pin);
 	}
-	return (NULL);
+	return NULL;
 }
 
 
@@ -494,7 +494,7 @@
 	pcb_coord_t value = (ctx->chgsize.is_absolute) ? ctx->chgsize.value : Via->Clearance + ctx->chgsize.value;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Via))
-		return (NULL);
+		return NULL;
 	if (value < 0)
 		value = 0;
 	value = MIN(PCB_MAX_LINESIZE, value);
@@ -524,7 +524,7 @@
 	pcb_coord_t value = (ctx->chgsize.is_absolute) ? ctx->chgsize.value : Pin->Thickness + ctx->chgsize.value;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pin))
-		return (NULL);
+		return NULL;
 	if (!PCB_FLAG_TEST(PCB_FLAG_HOLE, Pin) && value <= PCB_MAX_PINORVIASIZE &&
 			value >= PCB_MIN_PINORVIASIZE && value >= Pin->DrillingHole + PCB_MIN_PINORVIACOPPER && value != Pin->Thickness) {
 		pcb_undo_add_obj_to_size(PCB_TYPE_PIN, Element, Pin, Pin);
@@ -540,7 +540,7 @@
 		pcb_pin_invalidate_draw(Pin);
 		return (Pin);
 	}
-	return (NULL);
+	return NULL;
 }
 
 /* changes the clearance size of a pin */
@@ -549,7 +549,7 @@
 	pcb_coord_t value = (ctx->chgsize.is_absolute) ? ctx->chgsize.value : Pin->Clearance + ctx->chgsize.value;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pin))
-		return (NULL);
+		return NULL;
 	if (value < 0)
 		value = 0;
 	value = MIN(PCB_MAX_LINESIZE, value);
@@ -623,7 +623,7 @@
 void *pcb_viaop_change_square(pcb_opctx_t *ctx, pcb_pin_t *Via)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Via))
-		return (NULL);
+		return NULL;
 	pcb_via_invalidate_erase(Via);
 	pcb_undo_add_obj_to_clear_poly(PCB_TYPE_VIA, NULL, Via, Via, pcb_false);
 	pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_VIA, NULL, Via);
@@ -644,7 +644,7 @@
 void *pcb_pinop_change_square(pcb_opctx_t *ctx, pcb_element_t *Element, pcb_pin_t *Pin)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pin))
-		return (NULL);
+		return NULL;
 	pcb_pin_invalidate_erase(Pin);
 	pcb_undo_add_obj_to_clear_poly(PCB_TYPE_PIN, Element, Pin, Pin, pcb_false);
 	pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_PIN, Element, Pin);
@@ -665,7 +665,7 @@
 void *pcb_pinop_set_square(pcb_opctx_t *ctx, pcb_element_t *Element, pcb_pin_t *Pin)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pin) || PCB_FLAG_TEST(PCB_FLAG_SQUARE, Pin))
-		return (NULL);
+		return NULL;
 
 	return (pcb_pinop_change_square(ctx, Element, Pin));
 }
@@ -674,7 +674,7 @@
 void *pcb_pinop_clear_square(pcb_opctx_t *ctx, pcb_element_t *Element, pcb_pin_t *Pin)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pin) || !PCB_FLAG_TEST(PCB_FLAG_SQUARE, Pin))
-		return (NULL);
+		return NULL;
 
 	return (pcb_pinop_change_square(ctx, Element, Pin));
 }
@@ -683,7 +683,7 @@
 void *pcb_viaop_change_octagon(pcb_opctx_t *ctx, pcb_pin_t *Via)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Via))
-		return (NULL);
+		return NULL;
 	pcb_via_invalidate_erase(Via);
 	pcb_undo_add_obj_to_clear_poly(PCB_TYPE_VIA, Via, Via, Via, pcb_false);
 	pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_VIA, Via, Via);
@@ -699,7 +699,7 @@
 void *pcb_viaop_set_octagon(pcb_opctx_t *ctx, pcb_pin_t *Via)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Via) || PCB_FLAG_TEST(PCB_FLAG_OCTAGON, Via))
-		return (NULL);
+		return NULL;
 
 	return (pcb_viaop_change_octagon(ctx, Via));
 }
@@ -708,7 +708,7 @@
 void *pcb_viaop_clear_octagon(pcb_opctx_t *ctx, pcb_pin_t *Via)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Via) || !PCB_FLAG_TEST(PCB_FLAG_OCTAGON, Via))
-		return (NULL);
+		return NULL;
 
 	return (pcb_viaop_change_octagon(ctx, Via));
 }
@@ -717,7 +717,7 @@
 void *pcb_pinop_change_octagon(pcb_opctx_t *ctx, pcb_element_t *Element, pcb_pin_t *Pin)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pin))
-		return (NULL);
+		return NULL;
 	pcb_pin_invalidate_erase(Pin);
 	pcb_undo_add_obj_to_clear_poly(PCB_TYPE_PIN, Element, Pin, Pin, pcb_false);
 	pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_PIN, Element, Pin);
@@ -733,7 +733,7 @@
 void *pcb_pinop_set_octagon(pcb_opctx_t *ctx, pcb_element_t *Element, pcb_pin_t *Pin)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pin) || PCB_FLAG_TEST(PCB_FLAG_OCTAGON, Pin))
-		return (NULL);
+		return NULL;
 
 	return (pcb_pinop_change_octagon(ctx, Element, Pin));
 }
@@ -742,7 +742,7 @@
 void *pcb_pinop_clear_octagon(pcb_opctx_t *ctx, pcb_element_t *Element, pcb_pin_t *Pin)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Pin) || !PCB_FLAG_TEST(PCB_FLAG_OCTAGON, Pin))
-		return (NULL);
+		return NULL;
 
 	return (pcb_pinop_change_octagon(ctx, Element, Pin));
 }
@@ -751,7 +751,7 @@
 pcb_bool pcb_pin_change_hole(pcb_pin_t *Via)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Via))
-		return (pcb_false);
+		return pcb_false;
 	pcb_via_invalidate_erase(Via);
 	pcb_undo_add_obj_to_flag(Via);
 	pcb_undo_add_obj_to_mask_size(PCB_TYPE_VIA, Via, Via, Via);
@@ -778,7 +778,7 @@
 	pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_VIA, Via, Via);
 	pcb_via_invalidate_draw(Via);
 	pcb_draw();
-	return (pcb_true);
+	return pcb_true;
 }
 
 /* changes the mask size of a pin */
@@ -798,7 +798,7 @@
 		pcb_pin_invalidate_draw(Pin);
 		return (Pin);
 	}
-	return (NULL);
+	return NULL;
 }
 
 /* changes the mask size of a via */
@@ -818,7 +818,7 @@
 		pcb_via_invalidate_draw(Via);
 		return (Via);
 	}
-	return (NULL);
+	return NULL;
 }
 
 /* copies a via */
Index: trunk/src/obj_poly.c
===================================================================
--- trunk/src/obj_poly.c	(revision 13664)
+++ trunk/src/obj_poly.c	(revision 13665)
@@ -435,7 +435,7 @@
 		shown_this_message = 1;
 	}
 
-	return (NULL);
+	return NULL;
 }
 
 /* changes the CLEARPOLY flag of a polygon */
@@ -442,7 +442,7 @@
 void *pcb_polyop_change_clear(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *Polygon)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Polygon))
-		return (NULL);
+		return NULL;
 	pcb_undo_add_obj_to_clear_poly(PCB_TYPE_POLY, Layer, Polygon, Polygon, pcb_true);
 	pcb_undo_add_obj_to_flag(Polygon);
 	PCB_FLAG_TOGGLE(PCB_FLAG_CLEARPOLY, Polygon);
@@ -468,7 +468,7 @@
 		line.Point1 = Polygon->Points[pcb_poly_contour_prev_point(Polygon, ctx->insert.idx)];
 		line.Point2 = Polygon->Points[ctx->insert.idx];
 		if (pcb_is_point_on_line((float) ctx->insert.x, (float) ctx->insert.y, 0.0, &line))
-			return (NULL);
+			return NULL;
 	}
 	/*
 	 * second, shift the points up to make room for the new point
@@ -505,7 +505,7 @@
 void *pcb_polyop_change_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_poly_t *poly)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, poly))
-		return (NULL);
+		return NULL;
 	pcb_poly_invalidate_erase(poly);
 	if (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLYPOLY, poly)) {
 		pcb_undo_add_obj_to_clear_poly(PCB_TYPE_POLY, Layer, poly, poly, pcb_false);
Index: trunk/src/obj_rat.c
===================================================================
--- trunk/src/obj_rat.c	(revision 13664)
+++ trunk/src/obj_rat.c	(revision 13665)
@@ -185,7 +185,7 @@
 	if (conf_core.editor.clear_line)
 		conf_set_editor(clear_line, 1);
 	if (!newone)
-		return (NULL);
+		return NULL;
 	pcb_undo_add_obj_to_create(PCB_TYPE_LINE, ctx->move.dst_layer, newone, newone);
 	if (PCB->RatOn)
 		pcb_rat_invalidate_erase(Rat);
Index: trunk/src/obj_subc.c
===================================================================
--- trunk/src/obj_subc.c	(revision 13664)
+++ trunk/src/obj_subc.c	(revision 13665)
@@ -1220,7 +1220,7 @@
 	pcb_subc_t *subc;
 
 	if (pcb_subclist_length(&buff->Data->subc) != 1)
-		return (pcb_false);
+		return pcb_false;
 
 	subc = pcb_subclist_first(&buff->Data->subc);
 	pcb_subclist_remove(subc);
@@ -1230,7 +1230,7 @@
 	buff->Data->parent_type = PCB_PARENT_INVALID;
 	buff->Data->parent.data = NULL;
 
-	return (pcb_true);
+	return pcb_true;
 }
 
 int pcb_subc_rebind(pcb_board_t *pcb, pcb_subc_t *sc)
@@ -1299,7 +1299,7 @@
 {
 #warning subc TODO: add undo
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, sc))
-		return (NULL);
+		return NULL;
 	PCB_FLAG_TOGGLE(PCB_FLAG_NONETLIST, sc);
 	return sc;
 }
@@ -1438,7 +1438,7 @@
 	pcb_data_t *data, *oldhack;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, *subc))
-		return (pcb_false);
+		return pcb_false;
 
 	assert((*subc)->parent_type = PCB_PARENT_DATA);
 	data = (*subc)->parent.data;
Index: trunk/src/obj_text.c
===================================================================
--- trunk/src/obj_text.c	(revision 13664)
+++ trunk/src/obj_text.c	(revision 13665)
@@ -102,7 +102,7 @@
 
 	pcb_add_text_on_layer(Layer, text, PCBFont);
 
-	return (text);
+	return text;
 }
 
 static pcb_text_t *pcb_text_copy_meta(pcb_text_t *dst, pcb_text_t *src)
@@ -356,7 +356,7 @@
 
 	PCB_SET_PARENT(text, layer, lay);
 
-	return (text);
+	return text;
 }
 
 /* changes the scaling factor of a text object */
@@ -366,7 +366,7 @@
 		: Text->Scale + PCB_COORD_TO_MIL(ctx->chgsize.value);
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Text))
-		return (NULL);
+		return NULL;
 	if (value <= PCB_MAX_TEXTSCALE && value >= PCB_MIN_TEXTSCALE && value != Text->Scale) {
 		pcb_undo_add_obj_to_size(PCB_TYPE_TEXT, Layer, Text, Text);
 		pcb_text_invalidate_erase(Layer, Text);
@@ -377,9 +377,9 @@
 		pcb_r_insert_entry(Layer->text_tree, (pcb_box_t *) Text, 0);
 		pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text);
 		pcb_text_invalidate_draw(Layer, Text);
-		return (Text);
+		return Text;
 	}
-	return (NULL);
+	return NULL;
 }
 
 /* sets data of a text object and calculates bounding box; memory must have
@@ -389,7 +389,7 @@
 	char *old = Text->TextString;
 
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Text))
-		return (NULL);
+		return NULL;
 	pcb_text_invalidate_erase(Layer, Text);
 	pcb_r_delete_entry(Layer->text_tree, (pcb_box_t *)Text);
 	pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text);
@@ -400,7 +400,7 @@
 	pcb_r_insert_entry(Layer->text_tree, (pcb_box_t *) Text, 0);
 	pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text);
 	pcb_text_invalidate_draw(Layer, Text);
-	return (old);
+	return old;
 }
 
 /* changes the clearance flag of a text */
@@ -407,7 +407,7 @@
 void *pcb_textop_change_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Text))
-		return (NULL);
+		return NULL;
 	pcb_text_invalidate_erase(Layer, Text);
 	if (PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Text)) {
 		pcb_undo_add_obj_to_clear_poly(PCB_TYPE_TEXT, Layer, Text, Text, pcb_false);
@@ -420,7 +420,7 @@
 		pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text);
 	}
 	pcb_text_invalidate_draw(Layer, Text);
-	return (Text);
+	return Text;
 }
 
 /* sets the clearance flag of a text */
@@ -427,7 +427,7 @@
 void *pcb_textop_set_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Text) || PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Text))
-		return (NULL);
+		return NULL;
 	return pcb_textop_change_join(ctx, Layer, Text);
 }
 
@@ -435,7 +435,7 @@
 void *pcb_textop_clear_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text)
 {
 	if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Text) || !PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Text))
-		return (NULL);
+		return NULL;
 	return pcb_textop_change_join(ctx, Layer, Text);
 }
 
@@ -449,7 +449,7 @@
 	pcb_text_copy_meta(text, Text);
 	pcb_text_invalidate_draw(Layer, text);
 	pcb_undo_add_obj_to_create(PCB_TYPE_TEXT, Layer, text, text);
-	return (text);
+	return text;
 }
 
 /* moves a text object */
@@ -602,7 +602,7 @@
 	pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text);
 	pcb_text_invalidate_draw(Layer, Text);
 	pcb_draw();
-	return (Text);
+	return Text;
 }
 
 void *pcb_textop_rotate(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_text_t *Text)
@@ -622,7 +622,7 @@
 	pcb_r_insert_entry(Layer->text_tree, (pcb_box_t *) Text, 0);
 	pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_TEXT, Layer, Text);
 	pcb_text_invalidate_draw(Layer, Text);
-	return (Text);
+	return Text;
 }
 
 void pcb_text_flip_side(pcb_layer_t *layer, pcb_text_t *text, pcb_coord_t y_offs)
Index: trunk/src/operation.c
===================================================================
--- trunk/src/operation.c	(revision 13664)
+++ trunk/src/operation.c	(revision 13665)
@@ -115,7 +115,7 @@
 			return (F->Rat(ctx, (pcb_rat_t *) Ptr1));
 		break;
 	}
-	return (NULL);
+	return NULL;
 }
 
 /* ----------------------------------------------------------------------
Index: trunk/src/plug_io.c
===================================================================
--- trunk/src/plug_io.c	(revision 13664)
+++ trunk/src/plug_io.c	(revision 13665)
@@ -688,7 +688,7 @@
 	result = pcb_write_pipe(Filename, pcb_false, fmt, pcb_true);
 	if (PCB_SWAP_IDENT)
 		pcb_buffers_flip_side(PCB);
-	return (result);
+	return result;
 }
 
 /* ---------------------------------------------------------------------------
@@ -932,7 +932,7 @@
 			unlink(fn_tmp);
 		free(fn_tmp);
 	}
-	return (result);
+	return result;
 }
 
 
Index: trunk/src/polygon.c
===================================================================
--- trunk/src/polygon.c	(revision 13664)
+++ trunk/src/polygon.c	(revision 13665)
@@ -1493,7 +1493,7 @@
 	pcb_bool changed = pcb_false;
 
 	if (pcb_undoing())
-		return (pcb_false);
+		return pcb_false;
 
 	for (n = 0; n < Polygon->PointN; n++) {
 		prev = pcb_poly_contour_prev_point(Polygon, n);
@@ -1508,7 +1508,7 @@
 			changed = pcb_true;
 		}
 	}
-	return (changed);
+	return changed;
 }
 
 /* ---------------------------------------------------------------------------
@@ -1555,7 +1555,7 @@
 			}
 		}
 	}
-	return (result);
+	return result;
 }
 
 /* ---------------------------------------------------------------------------
Index: trunk/src/rats.c
===================================================================
--- trunk/src/rats.c	(revision 13664)
+++ trunk/src/rats.c	(revision 13665)
@@ -89,12 +89,12 @@
 		for (i = 0, j++; InString[j] != '\0'; i++, j++)
 			PinNum[i] = InString[j];
 		PinNum[i] = '\0';
-		return (pcb_false);
+		return pcb_false;
 	}
 	else {
 		ElementName[j] = '\0';
 		pcb_message(PCB_MSG_ERROR, _("Bad net-list format encountered near: \"%s\"\n"), ElementName);
-		return (pcb_true);
+		return pcb_true;
 	}
 }
 
@@ -161,7 +161,7 @@
 	char PinNum[256];
 
 	if (ParseConnection(entry->ListEntry, ElementName, PinNum))
-		return (pcb_false);
+		return pcb_false;
 	for (j = 0; PinNum[j] != '\0'; j++);
 	if (j == 0) {
 		pcb_message(PCB_MSG_ERROR, _("Error! Netlist file is missing pin!\n" "white space after \"%s-\"\n"), ElementName);
@@ -169,9 +169,9 @@
 	}
 	else {
 		if (pcb_term_find_name_ppt(ElementName, PinNum, conn, Same))
-			return (pcb_true);
+			return pcb_true;
 		if (Same)
-			return (pcb_false);
+			return pcb_false;
 		if (PinNum[j - 1] < '0' || PinNum[j - 1] > '9') {
 			pcb_message(PCB_MSG_WARNING, "WARNING! Pin number ending with '%c'"
 							" encountered in netlist file\n" "Probably a bad netlist file format\n", PinNum[j - 1]);
@@ -178,7 +178,7 @@
 		}
 	}
 	pcb_message(PCB_MSG_WARNING, _("Can't find %s pin %s called for in netlist.\n"), ElementName, PinNum);
-	return (pcb_false);
+	return pcb_false;
 }
 
 static const char *get_refdes(void *ptr1)
@@ -261,7 +261,7 @@
 	static pcb_netlist_t *Wantlist = NULL;
 
 	if (!net_menu->MenuN)
-		return (NULL);
+		return NULL;
 	pcb_netlist_free(Wantlist);
 	free(Wantlist);
 	badnet = pcb_false;
@@ -803,7 +803,7 @@
 	Wantlist = pcb_rat_proc_netlist(&(PCB->NetlistLib[PCB_NETLIST_EDITED]));
 	if (!Wantlist) {
 		pcb_message(PCB_MSG_WARNING, _("Can't add rat lines because no netlist is loaded.\n"));
-		return (pcb_false);
+		return pcb_false;
 	}
 	changed = pcb_false;
 	/* initialize finding engine */
@@ -844,7 +844,7 @@
 	pcb_conn_lookup_uninit();
 	pcb_restore_find_flag();
 	if (funcp)
-		return (pcb_true);
+		return pcb_true;
 
 	if (Warned || changed) {
 		pcb_stub_rat_proc_shorts();
@@ -859,7 +859,7 @@
 		if (ratlist_length(&PCB->Data->Rat) > 0) {
 			pcb_message(PCB_MSG_INFO, "%d rat line%s remaining\n", ratlist_length(&PCB->Data->Rat), ratlist_length(&PCB->Data->Rat) > 1 ? "s" : "");
 		}
-		return (pcb_true);
+		return pcb_true;
 	}
 	if (!SelectedOnly && !Warned) {
 		if (!ratlist_length(&PCB->Data->Rat) && !badnet)
@@ -868,7 +868,7 @@
 			pcb_message(PCB_MSG_WARNING, _("Nothing more to add, but there are\n"
 								"either rat-lines in the layout, disabled nets\n" "in the net-list, or missing components\n"));
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* XXX: This is copied in large part from AddAllRats above; for
@@ -961,18 +961,18 @@
 
 	if (pcb_crosshair.AttachedLine.Point1.X == pcb_crosshair.AttachedLine.Point2.X
 			&& pcb_crosshair.AttachedLine.Point1.Y == pcb_crosshair.AttachedLine.Point2.Y)
-		return (NULL);
+		return NULL;
 
 	found = pcb_search_obj_by_location(PCB_TYPE_PAD | PCB_TYPE_PIN | PCB_TYPE_PSTK, &ptr1, &ptr2, &ptr3,
 																 pcb_crosshair.AttachedLine.Point1.X, pcb_crosshair.AttachedLine.Point1.Y, 5);
 	if (found == PCB_TYPE_NONE) {
 		pcb_message(PCB_MSG_ERROR, _("No pad/pin under rat line\n"));
-		return (NULL);
+		return NULL;
 	}
 	rd = get_refdes(ptr1);
 	if ((rd == NULL) || (*rd == 0) || (*rd == '<')) {
 		pcb_message(PCB_MSG_ERROR, _("You must name the starting element first\n"));
-		return (NULL);
+		return NULL;
 	}
 
 	Sgrp = Cgrp = -1;
@@ -986,12 +986,12 @@
 																 pcb_crosshair.AttachedLine.Point2.X, pcb_crosshair.AttachedLine.Point2.Y, 5);
 	if (found == PCB_TYPE_NONE) {
 		pcb_message(PCB_MSG_ERROR, _("No pad/pin under rat line\n"));
-		return (NULL);
+		return NULL;
 	}
 	rd = get_refdes(ptr1);
 	if ((rd == NULL) || (*rd == 0) || (*rd == '<')) {
 		pcb_message(PCB_MSG_ERROR, _("You must name the ending element first\n"));
-		return (NULL);
+		return NULL;
 	}
 	group2 = (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (pcb_pad_t *) ptr2) ? Sgrp : Cgrp);
 	name2 = pcb_connection_name(ptr2);
@@ -1000,7 +1000,7 @@
 	if (menu) {
 		if (pcb_netnode_to_netname(name2)) {
 			pcb_message(PCB_MSG_ERROR, _("Both connections already in netlist - cannot merge nets\n"));
-			return (NULL);
+			return NULL;
 		}
 		entry = pcb_lib_entry_new(menu);
 		entry->ListEntry = pcb_strdup(name2);
Index: trunk/src/remove.c
===================================================================
--- trunk/src/remove.c	(revision 13664)
+++ trunk/src/remove.c	(revision 13665)
@@ -88,9 +88,9 @@
 	if (pcb_selected_operation(PCB, PCB->Data, &RemoveFunctions, &ctx, pcb_false, PCB_TYPEMASK_ALL)) {
 		pcb_undo_inc_serial();
 		pcb_draw();
-		return (pcb_true);
+		return pcb_true;
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
Index: trunk/src/search.c
===================================================================
--- trunk/src/search.c	(revision 13664)
+++ trunk/src/search.c	(revision 13665)
@@ -209,7 +209,7 @@
 
 	/* search only if pin-layer is visible */
 	if (!PCB->PinOn)
-		return (pcb_false);
+		return pcb_false;
 	info.ptr1 = (void **) Element;
 	info.ptr2 = (void **) Pad;
 	info.ptr3 = (void **) Dummy;
@@ -563,8 +563,8 @@
 	pcb_r_search(SearchLayer->polygon_tree, &SearchBox, NULL, polypoint_callback, &ctx, NULL);
 
 	if (ctx.found)
-		return (pcb_true);
-	return (pcb_false);
+		return pcb_true;
+	return pcb_false;
 }
 
 static pcb_r_dir_t name_callback(const pcb_box_t * box, void *cl)
@@ -610,7 +610,7 @@
 		if (pcb_r_search(PCB->Data->name_tree[PCB_ELEMNAME_IDX_VISIBLE()], &SearchBox, NULL, name_callback, &info, NULL))
 			return pcb_true;
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 static pcb_r_dir_t element_callback(const pcb_box_t * box, void *cl)
@@ -724,8 +724,8 @@
 pcb_bool pcb_is_point_on_line_end(pcb_coord_t X, pcb_coord_t Y, pcb_rat_t *Line)
 {
 	if (((X == Line->Point1.X) && (Y == Line->Point1.Y)) || ((X == Line->Point2.X) && (Y == Line->Point2.Y)))
-		return (pcb_true);
-	return (pcb_false);
+		return pcb_true;
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -815,7 +815,7 @@
 	/* first, see if point 1 is inside the rectangle */
 	/* in case the whole line is inside the rectangle */
 	if (X1 < Line->Point1.X && X2 > Line->Point1.X && Y1 < Line->Point1.Y && Y2 > Line->Point1.Y)
-		return (pcb_true);
+		return pcb_true;
 	/* construct a set of dummy lines and check each of them */
 	line.Thickness = 0;
 	line.Flags = pcb_no_flags();
@@ -825,7 +825,7 @@
 	line.Point1.X = X1;
 	line.Point2.X = X2;
 	if (pcb_intersect_line_line(&line, Line))
-		return (pcb_true);
+		return pcb_true;
 
 	/* upper-right to lower-right corner */
 	line.Point1.X = X2;
@@ -832,7 +832,7 @@
 	line.Point1.Y = Y1;
 	line.Point2.Y = Y2;
 	if (pcb_intersect_line_line(&line, Line))
-		return (pcb_true);
+		return pcb_true;
 
 	/* lower-right to lower-left corner */
 	line.Point1.Y = Y2;
@@ -839,7 +839,7 @@
 	line.Point1.X = X1;
 	line.Point2.X = X2;
 	if (pcb_intersect_line_line(&line, Line))
-		return (pcb_true);
+		return pcb_true;
 
 	/* lower-left to upper-left corner */
 	line.Point2.X = X1;
@@ -846,9 +846,9 @@
 	line.Point1.Y = Y1;
 	line.Point2.Y = Y2;
 	if (pcb_intersect_line_line(&line, Line))
-		return (pcb_true);
+		return pcb_true;
 
-	return (pcb_false);
+	return pcb_false;
 }
 
 /*checks if a point (of null radius) is in a slanted rectangle */
@@ -903,27 +903,27 @@
 	line.Point2.X = p[1].X;
 	line.Point2.Y = p[1].Y;
 	if (pcb_intersect_line_line(&line, Line))
-		return (pcb_true);
+		return pcb_true;
 
 	/* upper-right to lower-right corner */
 	line.Point1.X = p[2].X;
 	line.Point1.Y = p[2].Y;
 	if (pcb_intersect_line_line(&line, Line))
-		return (pcb_true);
+		return pcb_true;
 
 	/* lower-right to lower-left corner */
 	line.Point2.X = p[3].X;
 	line.Point2.Y = p[3].Y;
 	if (pcb_intersect_line_line(&line, Line))
-		return (pcb_true);
+		return pcb_true;
 
 	/* lower-left to upper-left corner */
 	line.Point1.X = p[0].X;
 	line.Point1.Y = p[0].Y;
 	if (pcb_intersect_line_line(&line, Line))
-		return (pcb_true);
+		return pcb_true;
 
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -940,10 +940,10 @@
 	box.X2 = X2; box.Y2 = Y2;
 	pcb_arc_get_end (Arc, 0, &x, &y);
 	if (PCB_POINT_IN_BOX(x, y, &box))
-		return (pcb_true);
+		return pcb_true;
 	pcb_arc_get_end (Arc, 1, &x, &y);
 	if (PCB_POINT_IN_BOX(x, y, &box))
-		return (pcb_true);
+		return pcb_true;
 
 	/* construct a set of dummy lines and check each of them */
 	line.Thickness = 0;
@@ -954,7 +954,7 @@
 	line.Point1.X = X1;
 	line.Point2.X = X2;
 	if (pcb_intersect_line_arc(&line, Arc))
-		return (pcb_true);
+		return pcb_true;
 
 	/* upper-right to lower-right corner */
 	line.Point1.X = line.Point2.X = X2;
@@ -961,7 +961,7 @@
 	line.Point1.Y = Y1;
 	line.Point2.Y = Y2;
 	if (pcb_intersect_line_arc(&line, Arc))
-		return (pcb_true);
+		return pcb_true;
 
 	/* lower-right to lower-left corner */
 	line.Point1.Y = line.Point2.Y = Y2;
@@ -968,7 +968,7 @@
 	line.Point1.X = X1;
 	line.Point2.X = X2;
 	if (pcb_intersect_line_arc(&line, Arc))
-		return (pcb_true);
+		return pcb_true;
 
 	/* lower-left to upper-left corner */
 	line.Point1.X = line.Point2.X = X1;
@@ -975,9 +975,9 @@
 	line.Point1.Y = Y1;
 	line.Point2.Y = Y2;
 	if (pcb_intersect_line_arc(&line, Arc))
-		return (pcb_true);
+		return pcb_true;
 
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -1620,7 +1620,7 @@
 	{
 		if (element->Name[1].TextString && PCB_NSTRCMP(element->Name[1].TextString, Name) == 0) {
 			result = element;
-			return (result);
+			return result;
 		}
 	}
 	PCB_END_LOOP;
Index: trunk/src/select.c
===================================================================
--- trunk/src/select.c	(revision 13664)
+++ trunk/src/select.c	(revision 13665)
@@ -119,7 +119,7 @@
 
 	type = pcb_search_screen(pcb_crosshair.X, pcb_crosshair.Y, PCB_SELECT_TYPES | PCB_LOOSE_SUBC, &ptr1, &ptr2, &ptr3);
 	if (type == PCB_TYPE_NONE || PCB_FLAG_TEST(PCB_FLAG_LOCK, (pcb_pin_t *) ptr2))
-		return (pcb_false);
+		return pcb_false;
 	switch (type) {
 	case PCB_TYPE_VIA:
 		pcb_undo_add_obj_to_flag(ptr1);
@@ -718,7 +718,7 @@
 		if (re_sei_errno(regex) != 0) {
 			pcb_message(PCB_MSG_ERROR, _("regexp error: %s\n"), re_error_str(re_sei_errno(regex)));
 			re_sei_free(regex);
-			return (pcb_false);
+			return pcb_false;
 		}
 	}
 	else {
Index: trunk/src/undo_old.c
===================================================================
--- trunk/src/undo_old.c	(revision 13664)
+++ trunk/src/undo_old.c	(revision 13665)
@@ -153,9 +153,9 @@
 		pcb_obj_rotate90(type, ptr1, ptr2, ptr3,
 								 Entry->Data.Rotate.CenterX, Entry->Data.Rotate.CenterY, (4 - Entry->Data.Rotate.Steps) & 0x03);
 		Entry->Data.Rotate.Steps = (4 - Entry->Data.Rotate.Steps) & 0x03;
-		return (pcb_true);
+		return pcb_true;
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -211,9 +211,9 @@
 	type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind);
 	if (type != PCB_TYPE_NONE) {
 		Entry->Data.ChangeName.Name = (char *) (pcb_chg_obj_name(type, ptr1, ptr2, ptr3, Entry->Data.ChangeName.Name));
-		return (pcb_true);
+		return pcb_true;
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -229,9 +229,9 @@
 	type = pcb_search_obj_by_id(PCB->Data, &ptr1, &ptr2, &ptr3, Entry->ID, Entry->Kind);
 	if (type != PCB_TYPE_NONE) {
 		Entry->Data.ChangeName.Name = (char *) (pcb_chg_obj_pinnum(type, ptr1, ptr2, ptr3, Entry->Data.ChangeName.Name));
-		return (pcb_true);
+		return pcb_true;
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -252,9 +252,9 @@
 		((pcb_pin_t *) ptr2)->DrillingHole = Entry->Data.Size;
 		Entry->Data.Size = swap;
 		pcb_draw_obj((pcb_any_obj_t *)ptr2);
-		return (pcb_true);
+		return pcb_true;
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -283,9 +283,9 @@
 		Entry->Data.AngleChange.angle[0] = old_sa;
 		Entry->Data.AngleChange.angle[1] = old_da;
 		pcb_draw_obj((pcb_any_obj_t *)a);
-		return (pcb_true);
+		return pcb_true;
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -314,9 +314,9 @@
 		Entry->Data.Move.DX = old_w;
 		Entry->Data.Move.DY = old_h;
 		pcb_draw_obj((pcb_any_obj_t *)a);
-		return (pcb_true);
+		return pcb_true;
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -340,9 +340,9 @@
 		Entry->Data.Size = swap;
 		if (pcb_undo_and_draw)
 			pcb_draw_obj((pcb_any_obj_t *)ptr2);
-		return (pcb_true);
+		return pcb_true;
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -367,9 +367,9 @@
 		Entry->Data.Size = swap;
 		if (pcb_undo_and_draw)
 			pcb_draw_obj((pcb_any_obj_t *)ptr2);
-		return (pcb_true);
+		return pcb_true;
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 
@@ -401,9 +401,9 @@
 		pcb_poly_clear_from_poly(PCB->Data, type, ptr1, ptr2);
 		if (pcb_undo_and_draw)
 			pcb_draw_obj((pcb_any_obj_t *)ptr2);
-		return (pcb_true);
+		return pcb_true;
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -445,11 +445,11 @@
 
 		if (pcb_undo_and_draw && must_redraw)
 			pcb_draw_obj((pcb_any_obj_t *)ptr2);
-		return (pcb_true);
+		return pcb_true;
 	}
 	pcb_message(PCB_MSG_ERROR, "hace Internal error: Can't find ID %d type %08x\n", Entry->ID, Entry->Kind);
 	pcb_message(PCB_MSG_ERROR, "for UndoFlag Operation. Previous flags: %s\n", pcb_strflg_f2s(Entry->Data.Flags, 0, NULL));
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -470,10 +470,10 @@
 		pcb_element_mirror(PCB->Data, element, Entry->Data.Move.DY);
 		if (pcb_undo_and_draw)
 			pcb_elem_invalidate_draw(element);
-		return (pcb_true);
+		return pcb_true;
 	}
 	pcb_message(PCB_MSG_ERROR, "hace Internal error: UndoMirror on object type %d\n", type);
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -494,10 +494,10 @@
 		pcb_subc_change_side(&subc, Entry->Data.Move.DY);
 		if (pcb_undo_and_draw)
 			DrawSubc(subc);
-		return (pcb_true);
+		return pcb_true;
 	}
 	pcb_message(PCB_MSG_ERROR, "hace Internal error: UndoOtherside on object type %x\n", type);
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -519,9 +519,9 @@
 		/* in order to make this re-doable we move it to the pcb_removelist */
 		pcb_move_obj_to_buffer(PCB, pcb_removelist, PCB->Data, type, ptr1, ptr2, ptr3);
 		Entry->Type = PCB_UNDO_REMOVE;
-		return (pcb_true);
+		return pcb_true;
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -539,9 +539,9 @@
 		pcb_move_obj(type, ptr1, ptr2, ptr3, -Entry->Data.Move.DX, -Entry->Data.Move.DY);
 		Entry->Data.Move.DX *= -1;
 		Entry->Data.Move.DY *= -1;
-		return (pcb_true);
+		return pcb_true;
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ----------------------------------------------------------------------
@@ -560,9 +560,9 @@
 		if (pcb_undo_and_draw)
 			DrawRecoveredObject((pcb_any_obj_t *)ptr2);
 		Entry->Type = PCB_UNDO_CREATE;
-		return (pcb_true);
+		return pcb_true;
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ----------------------------------------------------------------------
@@ -581,9 +581,9 @@
 		swap = pcb_layer_id(PCB->Data, (pcb_layer_t *) ptr1);
 		pcb_move_obj_to_layer(type, ptr1, ptr2, ptr3, LAYER_PTR(Entry->Data.MoveToLayer.OriginalLayer), pcb_true);
 		Entry->Data.MoveToLayer.OriginalLayer = swap;
-		return (pcb_true);
+		return pcb_true;
 	}
-	return (pcb_false);
+	return pcb_false;
 }
 
 /* ---------------------------------------------------------------------------
@@ -617,11 +617,11 @@
 			Entry->Type = PCB_UNDO_INSERT_POINT;
 			Entry->ID = Entry->Data.RemovedPoint.ID;
 			Entry->Kind = PCB_TYPE_POLY_POINT;
-			return (pcb_true);
+			return pcb_true;
 		}
 
 	default:
-		return (pcb_false);
+		return pcb_false;
 	}
 }
 
@@ -670,11 +670,11 @@
 			pcb_destroy_object(PCB->Data, PCB_TYPE_POLY_POINT, layer, polygon, pnt);
 			if (pcb_undo_and_draw && layer->meta.real.vis)
 				pcb_poly_invalidate_draw(layer, polygon);
-			return (pcb_true);
+			return pcb_true;
 		}
 
 	default:
-		return (pcb_false);
+		return pcb_false;
 	}
 }
 
@@ -710,7 +710,7 @@
 	obj = (pcb_any_obj_t *) pcb_move_obj_to_buffer(PCB, PCB->Data, pcb_removelist, type, ptr1, ptr2, ptr3);
 	if (Entry->Kind == PCB_TYPE_POLY)
 		pcb_poly_init_clip(PCB->Data, (pcb_layer_t *) ptr1b, (pcb_poly_t *) obj);
-	return (pcb_true);
+	return pcb_true;
 }
 
 /* ---------------------------------------------------------------------------
Index: trunk/src_plugins/autoroute/autoroute.c
===================================================================
--- trunk/src_plugins/autoroute/autoroute.c	(revision 13664)
+++ trunk/src_plugins/autoroute/autoroute.c	(revision 13665)
@@ -4580,16 +4580,16 @@
 		if (PCB->RouteStyle.array[i].Thick == 0 ||
 				PCB->RouteStyle.array[i].Diameter == 0 || PCB->RouteStyle.array[i].Hole == 0 || PCB->RouteStyle.array[i].Clearance == 0) {
 			pcb_message(PCB_MSG_ERROR, "You must define proper routing styles\n" "before auto-routing.\n");
-			return (pcb_false);
+			return pcb_false;
 		}
 	}
 	if (ratlist_length(&PCB->Data->Rat) == 0)
-		return (pcb_false);
+		return pcb_false;
 	pcb_save_find_flag(PCB_FLAG_DRC);
 	rd = CreateRouteData();
 	if (rd == NULL) {
 		pcb_message(PCB_MSG_ERROR, "Failed to initialize data; might be missing\n" "top or bottom copper layer.\n");
-		return (pcb_false);
+		return pcb_false;
 	}
 
 	if (1) {
Index: trunk/src_plugins/import_edif/edif.c
===================================================================
--- trunk/src_plugins/import_edif/edif.c	(revision 13664)
+++ trunk/src_plugins/import_edif/edif.c	(revision 13665)
@@ -5617,7 +5617,7 @@
       }
       return (wlk->String);
     }
-  return (NULL);
+  return NULL;
 }
 /*
  *	Token hash table.
Index: trunk/src_plugins/import_edif/edif.y
===================================================================
--- trunk/src_plugins/import_edif/edif.y	(revision 13664)
+++ trunk/src_plugins/import_edif/edif.y	(revision 13665)
@@ -3829,7 +3829,7 @@
       }
       return (wlk->String);
     }
-  return (NULL);
+  return NULL;
 }
 /*
  *	Token hash table.