--- a/road_cmd.c	Fri Mar 10 10:01:56 2006 +0000
+++ b/road_cmd.c	Fri Mar 10 11:27:52 2006 +0000
@@ -129,11 +129,11 @@
 			if (!EnsureNoVehicleZ(tile, TilePixelHeight(tile))) return CMD_ERROR;
 
 			if ((ti.map5 & 0xE9) == 0xE8) {
-				if (pieces & ROAD_X) goto return_error;
+				if (pieces & ROAD_X) return CMD_ERROR;
 			} else if ((ti.map5 & 0xE9) == 0xE9) {
-				if (pieces & ROAD_Y) goto return_error;
+				if (pieces & ROAD_Y) return CMD_ERROR;
 			} else {
-				goto return_error;
+				return CMD_ERROR;
 			}
 
 			cost = _price.remove_road * 2;
@@ -163,7 +163,7 @@
 
 					// limit the bits to delete to the existing bits.
 					c &= present;
-					if (c == 0) goto return_error;
+					if (c == 0) return CMD_ERROR;
 
 					// calculate the cost
 					cost = 0;
@@ -188,7 +188,7 @@
 
 				case ROAD_CROSSING: {
 					if (pieces & ComplementRoadBits(GetCrossingRoadBits(tile))) {
-						goto return_error;
+						return CMD_ERROR;
 					}
 
 					cost = _price.remove_road * 2;
@@ -203,12 +203,10 @@
 
 				default:
 				case ROAD_DEPOT:
-					goto return_error;
+					return CMD_ERROR;
 			}
 
-		default:
-return_error:;
-			return_cmd_error(INVALID_STRING_ID);
+		default: return CMD_ERROR;
 	}
 }