Index: trunk/tests/RTT/ref/mech.exc/mech.unplated.cnc
===================================================================
--- trunk/tests/RTT/ref/mech.exc/mech.unplated.cnc	(revision 29099)
+++ trunk/tests/RTT/ref/mech.exc/mech.unplated.cnc	(revision 29100)
@@ -1,8 +1,8 @@
 M48
 INCH
-T12C0.010
+T11C0.010
 %
-T12
+T11
 G05
 X001400Y003900
 X002300Y001700
Index: trunk/tests/RTT/ref/mech.gbr/mech.global.mech.proute.9.gbr
===================================================================
--- trunk/tests/RTT/ref/mech.gbr/mech.global.mech.proute.9.gbr	(revision 29099)
+++ trunk/tests/RTT/ref/mech.gbr/mech.global.mech.proute.9.gbr	(revision 29100)
@@ -9,6 +9,6 @@
 %MOIN*%
 %FSLAX25Y25*%
 %LNGLOBAL_MECH_PROUTE_9*%
-%ADD27C,0.0100*%
-G54D27*X21500Y45000D02*X22500D01*
+%ADD25C,0.0100*%
+G54D25*X21500Y45000D02*X22500D01*
 M30
Index: trunk/tests/RTT/ref/mech.gbr/mech.global.mech.uroute.8.gbr
===================================================================
--- trunk/tests/RTT/ref/mech.gbr/mech.global.mech.uroute.8.gbr	(revision 29099)
+++ trunk/tests/RTT/ref/mech.gbr/mech.global.mech.uroute.8.gbr	(revision 29100)
@@ -9,7 +9,7 @@
 %MOIN*%
 %FSLAX25Y25*%
 %LNGLOBAL_MECH_UROUTE_8*%
-%ADD26C,0.0100*%
-G54D26*X13500Y45000D02*X14500D01*
+%ADD24C,0.0100*%
+G54D24*X13500Y45000D02*X14500D01*
 X23000Y17000D03*
 M30
Index: trunk/tests/RTT/ref/mech.gbr/mech.logical.virtual.fab.none.gbr
===================================================================
--- trunk/tests/RTT/ref/mech.gbr/mech.logical.virtual.fab.none.gbr	(revision 29099)
+++ trunk/tests/RTT/ref/mech.gbr/mech.logical.virtual.fab.none.gbr	(revision 29100)
@@ -9,11 +9,11 @@
 %MOIN*%
 %FSLAX25Y25*%
 %LNLOGICAL_VIRTUAL_FAB_NONE*%
-%ADD31C,0.0100*%
-%ADD30C,0.0001*%
-%ADD29C,0.0060*%
-%ADD28C,0.0080*%
-G54D28*X14000Y39000D02*Y37400D01*
+%ADD29C,0.0100*%
+%ADD28C,0.0001*%
+%ADD27C,0.0060*%
+%ADD26C,0.0080*%
+G54D26*X14000Y39000D02*Y37400D01*
 Y39000D02*X15387Y39800D01*
 X14000Y39000D02*X12613Y39800D01*
 X22000Y40600D02*Y37400D01*
@@ -20,7 +20,7 @@
 X20400Y39000D02*X23600D01*
 X15000Y92850D02*Y89650D01*
 X13400Y91250D02*X16600D01*
-G54D29*X135000Y95000D02*X136500Y92000D01*
+G54D27*X135000Y95000D02*X136500Y92000D01*
 X138000Y95000D01*
 X136500Y92000D02*Y89000D01*
 X139800Y92300D02*X142050D01*
@@ -58,7 +58,7 @@
 X98000Y108800D02*X99200Y110000D01*
 Y104000D01*
 X98000D02*X100250D01*
-G54D30*G36*
+G54D28*G36*
 X45000Y110000D02*X49500D01*
 Y104000D01*
 X45000D01*
@@ -76,10 +76,10 @@
 X55800D01*
 Y110000D01*
 G37*
-G54D29*X61200Y108800D02*X62400Y110000D01*
+G54D27*X61200Y108800D02*X62400Y110000D01*
 Y104000D01*
 X61200D02*X63450D01*
-G54D30*G36*
+G54D28*G36*
 X65250Y110000D02*X69750D01*
 Y104000D01*
 X65250D01*
@@ -103,16 +103,16 @@
 X55800D01*
 Y95000D01*
 G37*
-G54D29*X61200Y93800D02*X62400Y95000D01*
+G54D27*X61200Y93800D02*X62400Y95000D01*
 Y89000D01*
 X61200D02*X63450D01*
-G54D30*G36*
+G54D28*G36*
 X65250Y95000D02*X69750D01*
 Y89000D01*
 X65250D01*
 Y95000D01*
 G37*
-G54D29*X3000Y125000D02*X3750Y124250D01*
+G54D27*X3000Y125000D02*X3750Y124250D01*
 X750Y125000D02*X3000D01*
 X0Y124250D02*X750Y125000D01*
 X0Y124250D02*Y122750D01*
@@ -123,7 +123,7 @@
 X3000Y119000D02*X3750Y119750D01*
 X750Y119000D02*X3000D01*
 X0Y119750D02*X750Y119000D01*
-G54D30*G36*
+G54D28*G36*
 X5550Y125000D02*X10050D01*
 Y119000D01*
 X5550D01*
@@ -153,7 +153,7 @@
 X27150D01*
 Y125000D01*
 G37*
-G54D29*X0Y118000D02*X5550D01*
+G54D27*X0Y118000D02*X5550D01*
 X41750Y125000D02*Y119000D01*
 X43700Y125000D02*X44750Y123950D01*
 Y120050D01*
@@ -160,7 +160,7 @@
 X43700Y119000D02*X44750Y120050D01*
 X41000Y119000D02*X43700D01*
 X41000Y125000D02*X43700D01*
-G54D30*G36*
+G54D28*G36*
 X46550D02*X51050D01*
 Y119000D01*
 X46550D01*
@@ -190,10 +190,10 @@
 X70850D01*
 Y125000D01*
 G37*
-G54D29*X76250D02*X77750D01*
+G54D27*X76250D02*X77750D01*
 X77000D02*Y119000D01*
 X76250D02*X77750D01*
-G54D30*G36*
+G54D28*G36*
 X79550Y125000D02*X84050D01*
 Y119000D01*
 X79550D01*
@@ -217,13 +217,13 @@
 X95750D01*
 Y125000D01*
 G37*
-G54D29*X41000Y118000D02*X52550D01*
+G54D27*X41000Y118000D02*X52550D01*
 X96050Y119000D02*X98000D01*
 X95000Y120050D02*X96050Y119000D01*
 X95000Y123950D02*Y120050D01*
 Y123950D02*X96050Y125000D01*
 X98000D01*
-G54D30*G36*
+G54D28*G36*
 X99800D02*X104300D01*
 Y119000D01*
 X99800D01*
@@ -247,7 +247,7 @@
 X116000D01*
 Y125000D01*
 G37*
-G54D29*X95000Y118000D02*X99800D01*
+G54D27*X95000Y118000D02*X99800D01*
 X130750Y125000D02*Y119000D01*
 X130000Y125000D02*X133000D01*
 X133750Y124250D01*
@@ -254,7 +254,7 @@
 Y122750D01*
 X133000Y122000D02*X133750Y122750D01*
 X130750Y122000D02*X133000D01*
-G54D30*G36*
+G54D28*G36*
 X135550Y125000D02*X140050D01*
 Y119000D01*
 X135550D01*
@@ -290,10 +290,10 @@
 X162550D01*
 Y125000D01*
 G37*
-G54D29*X130000Y118000D02*X135550D01*
+G54D27*X130000Y118000D02*X135550D01*
 X0Y140000D02*X3000D01*
 X1500D02*Y134000D01*
-G54D30*G36*
+G54D28*G36*
 X4800Y140000D02*X9300D01*
 Y134000D01*
 X4800D01*
@@ -335,10 +335,10 @@
 X39900D01*
 Y140000D01*
 G37*
-G54D29*X48000Y138800D02*X49200Y140000D01*
+G54D27*X48000Y138800D02*X49200Y140000D01*
 Y134000D01*
 X48000D02*X50250D01*
-G54D30*G36*
+G54D28*G36*
 X54750Y140000D02*X59250D01*
 Y134000D01*
 X54750D01*
@@ -554,13 +554,13 @@
 X259950D01*
 Y140000D01*
 G37*
-G54D29*X268050Y139250D02*X268800Y140000D01*
+G54D27*X268050Y139250D02*X268800Y140000D01*
 X271050D01*
 X271800Y139250D01*
 Y137750D01*
 X268050Y134000D02*X271800Y137750D01*
 X268050Y134000D02*X271800D01*
-G54D30*G36*
+G54D28*G36*
 X276300Y140000D02*X280800D01*
 Y134000D01*
 X276300D01*
@@ -620,8 +620,8 @@
 X327600D01*
 Y140000D01*
 G37*
-G54D31*X13000Y32000D02*X16000D01*
-G54D29*X12775Y-8000D02*X15775D01*
+G54D29*X13000Y32000D02*X16000D01*
+G54D27*X12775Y-8000D02*X15775D01*
 X16525Y-7250D01*
 Y-5450D02*Y-7250D01*
 X15775Y-4700D02*X16525Y-5450D01*
@@ -631,7 +631,7 @@
 X16525Y-2750D01*
 Y-3950D01*
 X15775Y-4700D02*X16525Y-3950D01*
-G54D30*G36*
+G54D28*G36*
 X18325Y-2000D02*X22825D01*
 Y-8000D01*
 X18325D01*
@@ -847,14 +847,14 @@
 X226225D01*
 Y-2000D01*
 G37*
-G54D31*X21000Y32000D02*X24000D01*
-G54D29*X200750Y80000D02*Y74000D01*
+G54D29*X21000Y32000D02*X24000D01*
+G54D27*X200750Y80000D02*Y74000D01*
 X202700Y80000D02*X203750Y78950D01*
 Y75050D01*
 X202700Y74000D02*X203750Y75050D01*
 X200000Y74000D02*X202700D01*
 X200000Y80000D02*X202700D01*
-G54D30*G36*
+G54D28*G36*
 X205550D02*X210050D01*
 Y74000D01*
 X205550D01*
@@ -914,13 +914,13 @@
 X256850D01*
 Y80000D01*
 G37*
-G54D29*X200000Y93500D02*Y89000D01*
+G54D27*X200000Y93500D02*Y89000D01*
 Y93500D02*X201050Y95000D01*
 X202700D01*
 X203750Y93500D01*
 Y89000D01*
 X200000Y92000D02*X203750D01*
-G54D30*G36*
+G54D28*G36*
 X205550Y95000D02*X210050D01*
 Y89000D01*
 X205550D01*
@@ -956,7 +956,7 @@
 X232550D01*
 Y95000D01*
 G37*
-G54D29*X240650D02*X243650D01*
+G54D27*X240650D02*X243650D01*
 X242150D02*Y89000D01*
 X245450Y92300D02*X247700D01*
 X245450Y89000D02*X248450D01*
@@ -977,7 +977,7 @@
 X257300D02*Y89000D01*
 X200000Y110000D02*X203000D01*
 X201500D02*Y104000D01*
-G54D30*G36*
+G54D28*G36*
 X204800Y110000D02*X209300D01*
 Y104000D01*
 X204800D01*
@@ -1067,10 +1067,10 @@
 X285800D01*
 Y110000D01*
 G37*
-G54D29*X293900D02*Y104000D01*
+G54D27*X293900D02*Y104000D01*
 Y110000D02*X296900D01*
 X293900Y107300D02*X296150D01*
-G54D30*G36*
+G54D28*G36*
 X298700Y110000D02*X303200D01*
 Y104000D01*
 X298700D01*
@@ -1130,13 +1130,13 @@
 X347300D01*
 Y110000D01*
 G37*
-G54D29*X356150D02*Y104000D01*
+G54D27*X356150D02*Y104000D01*
 X358100Y110000D02*X359150Y108950D01*
 Y105050D01*
 X358100Y104000D02*X359150Y105050D01*
 X355400Y104000D02*X358100D01*
 X355400Y110000D02*X358100D01*
-G54D30*G36*
+G54D28*G36*
 X360950D02*X365450D01*
 Y104000D01*
 X360950D01*