diff --git a/src/fileFormats/stl/STLAsciiParseRagel.C b/src/fileFormats/stl/STLAsciiParseRagel.C
index 2dc7a427ae..9c1ed17aea 100644
--- a/src/fileFormats/stl/STLAsciiParseRagel.C
+++ b/src/fileFormats/stl/STLAsciiParseRagel.C
@@ -35,6 +35,9 @@ Description
 #include "STLReader.H"
 #include "OSspecific.H"
 
+// Ragel switch/case logic may have several implicit fallthroughs
+#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+
 // https://en.wikipedia.org/wiki/STL_%28file_format%29#ASCII_STL
 //
 // Format
@@ -73,12 +76,12 @@ Description
 
 // Define the machine actions
 
-#line 102 "STLAsciiParseRagel.rl"
+#line 105 "STLAsciiParseRagel.rl"
 
 
 
 
-#line 145 "STLAsciiParseRagel.rl"
+#line 148 "STLAsciiParseRagel.rl"
 
 
 
@@ -87,14 +90,14 @@ Description
 //
 
 
-#line 91 "STLAsciiParseRagel.C"
+#line 94 "STLAsciiParseRagel.C"
 static const int stlAscii_start = 1;
 static const int stlAscii_error = 0;
 
 static const int stlAscii_en_main = 1;
 
 
-#line 153 "STLAsciiParseRagel.rl"
+#line 156 "STLAsciiParseRagel.rl"
 
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -146,12 +149,12 @@ void Foam::Detail::STLAsciiParseRagel::execute(std::istream& is)
     int cs;
 
     
-#line 150 "STLAsciiParseRagel.C"
+#line 153 "STLAsciiParseRagel.C"
 	{
 	cs = stlAscii_start;
 	}
 
-#line 203 "STLAsciiParseRagel.rl"
+#line 206 "STLAsciiParseRagel.rl"
    /* ^^^ FSM initialization here ^^^ */;
 
     // Local token start
@@ -205,21 +208,21 @@ void Foam::Detail::STLAsciiParseRagel::execute(std::istream& is)
         }
 
         
-#line 209 "STLAsciiParseRagel.C"
+#line 212 "STLAsciiParseRagel.C"
 	{
 	if ( p == pe )
 		goto _test_eof;
 	switch ( cs )
 	{
 tr2:
-#line 76 "STLAsciiParseRagel.rl"
+#line 79 "STLAsciiParseRagel.rl"
 	{ ++lineNum_; /* Count '\n' occurrences */ }
 	goto st1;
 st1:
 	if ( ++p == pe )
 		goto _test_eof1;
 case 1:
-#line 223 "STLAsciiParseRagel.C"
+#line 226 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 10: goto tr2;
 		case 32: goto st1;
@@ -230,98 +233,98 @@ case 1:
 		goto st1;
 	goto tr0;
 tr0:
-#line 94 "STLAsciiParseRagel.rl"
+#line 97 "STLAsciiParseRagel.rl"
 	{ die("solid", p, pe); }
 	goto st0;
 tr12:
-#line 94 "STLAsciiParseRagel.rl"
+#line 97 "STLAsciiParseRagel.rl"
 	{ die("solid", p, pe); }
-#line 96 "STLAsciiParseRagel.rl"
+#line 99 "STLAsciiParseRagel.rl"
 	{ die("facet", p, pe); }
-#line 95 "STLAsciiParseRagel.rl"
+#line 98 "STLAsciiParseRagel.rl"
 	{ die("endsolid", p, pe); }
 	goto st0;
 tr17:
-#line 96 "STLAsciiParseRagel.rl"
+#line 99 "STLAsciiParseRagel.rl"
 	{ die("facet", p, pe); }
-#line 95 "STLAsciiParseRagel.rl"
+#line 98 "STLAsciiParseRagel.rl"
 	{ die("endsolid", p, pe); }
 	goto st0;
 tr30:
-#line 95 "STLAsciiParseRagel.rl"
+#line 98 "STLAsciiParseRagel.rl"
 	{ die("endsolid", p, pe); }
 	goto st0;
 tr39:
-#line 96 "STLAsciiParseRagel.rl"
+#line 99 "STLAsciiParseRagel.rl"
 	{ die("facet", p, pe); }
 	goto st0;
 tr49:
-#line 96 "STLAsciiParseRagel.rl"
+#line 99 "STLAsciiParseRagel.rl"
 	{ die("facet", p, pe); }
-#line 98 "STLAsciiParseRagel.rl"
+#line 101 "STLAsciiParseRagel.rl"
 	{ die("loop", p, pe); }
 	goto st0;
 tr52:
-#line 98 "STLAsciiParseRagel.rl"
+#line 101 "STLAsciiParseRagel.rl"
 	{ die("loop", p, pe); }
 	goto st0;
 tr65:
-#line 98 "STLAsciiParseRagel.rl"
+#line 101 "STLAsciiParseRagel.rl"
 	{ die("loop", p, pe); }
-#line 100 "STLAsciiParseRagel.rl"
+#line 103 "STLAsciiParseRagel.rl"
 	{ die("vertex", p, pe); }
 	goto st0;
 tr68:
-#line 100 "STLAsciiParseRagel.rl"
+#line 103 "STLAsciiParseRagel.rl"
 	{ die("vertex", p, pe); }
 	goto st0;
 tr184:
-#line 100 "STLAsciiParseRagel.rl"
+#line 103 "STLAsciiParseRagel.rl"
 	{ die("vertex", p, pe); }
-#line 99 "STLAsciiParseRagel.rl"
+#line 102 "STLAsciiParseRagel.rl"
 	{ die("endloop", p, pe); }
 	goto st0;
 tr187:
-#line 99 "STLAsciiParseRagel.rl"
+#line 102 "STLAsciiParseRagel.rl"
 	{ die("endloop", p, pe); }
 	goto st0;
 tr197:
-#line 99 "STLAsciiParseRagel.rl"
+#line 102 "STLAsciiParseRagel.rl"
 	{ die("endloop", p, pe); }
-#line 97 "STLAsciiParseRagel.rl"
+#line 100 "STLAsciiParseRagel.rl"
 	{ die("endfacet", p, pe); }
 	goto st0;
 tr200:
-#line 97 "STLAsciiParseRagel.rl"
+#line 100 "STLAsciiParseRagel.rl"
 	{ die("endfacet", p, pe); }
 	goto st0;
 tr214:
-#line 96 "STLAsciiParseRagel.rl"
+#line 99 "STLAsciiParseRagel.rl"
 	{ die("facet", p, pe); }
-#line 97 "STLAsciiParseRagel.rl"
+#line 100 "STLAsciiParseRagel.rl"
 	{ die("endfacet", p, pe); }
-#line 95 "STLAsciiParseRagel.rl"
+#line 98 "STLAsciiParseRagel.rl"
 	{ die("endsolid", p, pe); }
 	goto st0;
 tr233:
-#line 94 "STLAsciiParseRagel.rl"
+#line 97 "STLAsciiParseRagel.rl"
 	{ die("solid", p, pe); }
-#line 95 "STLAsciiParseRagel.rl"
+#line 98 "STLAsciiParseRagel.rl"
 	{ die("endsolid", p, pe); }
 	goto st0;
-#line 313 "STLAsciiParseRagel.C"
+#line 316 "STLAsciiParseRagel.C"
 st0:
 cs = 0;
 	goto _out;
 tr235:
-#line 76 "STLAsciiParseRagel.rl"
+#line 79 "STLAsciiParseRagel.rl"
 	{ ++lineNum_; /* Count '\n' occurrences */ }
 	goto st2;
 st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-#line 325 "STLAsciiParseRagel.C"
+#line 328 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 79: goto st3;
 		case 111: goto st3;
@@ -367,32 +370,32 @@ case 6:
 		goto tr8;
 	goto tr0;
 tr8:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st7;
 st7:
 	if ( ++p == pe )
 		goto _test_eof7;
 case 7:
-#line 378 "STLAsciiParseRagel.C"
+#line 381 "STLAsciiParseRagel.C"
 	if ( (*p) == 10 )
 		goto tr11;
 	goto st7;
 tr9:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
-#line 79 "STLAsciiParseRagel.rl"
+#line 82 "STLAsciiParseRagel.rl"
 	{ beginSolid(word::validate(tok, p)); }
 	goto st8;
 tr11:
-#line 79 "STLAsciiParseRagel.rl"
+#line 82 "STLAsciiParseRagel.rl"
 	{ beginSolid(word::validate(tok, p)); }
 	goto st8;
 st8:
 	if ( ++p == pe )
 		goto _test_eof8;
 case 8:
-#line 396 "STLAsciiParseRagel.C"
+#line 399 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 32: goto tr13;
 		case 67: goto tr14;
@@ -406,14 +409,14 @@ case 8:
 		goto tr13;
 	goto tr12;
 tr13:
-#line 76 "STLAsciiParseRagel.rl"
+#line 79 "STLAsciiParseRagel.rl"
 	{ ++lineNum_; /* Count '\n' occurrences */ }
 	goto st9;
 st9:
 	if ( ++p == pe )
 		goto _test_eof9;
 case 9:
-#line 417 "STLAsciiParseRagel.C"
+#line 420 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 10: goto tr13;
 		case 32: goto st9;
@@ -428,14 +431,14 @@ case 9:
 		goto st9;
 	goto tr17;
 tr14:
-#line 76 "STLAsciiParseRagel.rl"
+#line 79 "STLAsciiParseRagel.rl"
 	{ ++lineNum_; /* Count '\n' occurrences */ }
 	goto st10;
 st10:
 	if ( ++p == pe )
 		goto _test_eof10;
 case 10:
-#line 439 "STLAsciiParseRagel.C"
+#line 442 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 79: goto st11;
 		case 111: goto st11;
@@ -490,14 +493,14 @@ case 15:
 		goto tr28;
 	goto tr17;
 tr28:
-#line 76 "STLAsciiParseRagel.rl"
+#line 79 "STLAsciiParseRagel.rl"
 	{ ++lineNum_; /* Count '\n' occurrences */ }
 	goto st16;
 st16:
 	if ( ++p == pe )
 		goto _test_eof16;
 case 16:
-#line 501 "STLAsciiParseRagel.C"
+#line 504 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 10: goto tr28;
 		case 32: goto st16;
@@ -510,14 +513,14 @@ case 16:
 		goto st16;
 	goto tr17;
 tr15:
-#line 76 "STLAsciiParseRagel.rl"
+#line 79 "STLAsciiParseRagel.rl"
 	{ ++lineNum_; /* Count '\n' occurrences */ }
 	goto st17;
 st17:
 	if ( ++p == pe )
 		goto _test_eof17;
 case 17:
-#line 521 "STLAsciiParseRagel.C"
+#line 524 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 78: goto st18;
 		case 110: goto st18;
@@ -597,14 +600,14 @@ case 164:
 		goto tr234;
 	goto tr233;
 tr234:
-#line 76 "STLAsciiParseRagel.rl"
+#line 79 "STLAsciiParseRagel.rl"
 	{ ++lineNum_; /* Count '\n' occurrences */ }
 	goto st165;
 st165:
 	if ( ++p == pe )
 		goto _test_eof165;
 case 165:
-#line 608 "STLAsciiParseRagel.C"
+#line 611 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 10: goto tr234;
 		case 32: goto st165;
@@ -615,14 +618,14 @@ case 165:
 		goto st165;
 	goto tr0;
 tr16:
-#line 76 "STLAsciiParseRagel.rl"
+#line 79 "STLAsciiParseRagel.rl"
 	{ ++lineNum_; /* Count '\n' occurrences */ }
 	goto st25;
 st25:
 	if ( ++p == pe )
 		goto _test_eof25;
 case 25:
-#line 626 "STLAsciiParseRagel.C"
+#line 629 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 65: goto st26;
 		case 97: goto st26;
@@ -674,26 +677,26 @@ case 30:
 		goto tr46;
 	goto tr45;
 tr45:
-#line 80 "STLAsciiParseRagel.rl"
+#line 83 "STLAsciiParseRagel.rl"
 	{ beginFacet(); }
 	goto st31;
 st31:
 	if ( ++p == pe )
 		goto _test_eof31;
 case 31:
-#line 685 "STLAsciiParseRagel.C"
+#line 688 "STLAsciiParseRagel.C"
 	if ( (*p) == 10 )
 		goto st32;
 	goto st31;
 tr46:
-#line 80 "STLAsciiParseRagel.rl"
+#line 83 "STLAsciiParseRagel.rl"
 	{ beginFacet(); }
 	goto st32;
 st32:
 	if ( ++p == pe )
 		goto _test_eof32;
 case 32:
-#line 697 "STLAsciiParseRagel.C"
+#line 700 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 32: goto tr50;
 		case 79: goto tr51;
@@ -703,14 +706,14 @@ case 32:
 		goto tr50;
 	goto tr49;
 tr50:
-#line 76 "STLAsciiParseRagel.rl"
+#line 79 "STLAsciiParseRagel.rl"
 	{ ++lineNum_; /* Count '\n' occurrences */ }
 	goto st33;
 st33:
 	if ( ++p == pe )
 		goto _test_eof33;
 case 33:
-#line 714 "STLAsciiParseRagel.C"
+#line 717 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 10: goto tr50;
 		case 32: goto st33;
@@ -721,14 +724,14 @@ case 33:
 		goto st33;
 	goto tr52;
 tr51:
-#line 76 "STLAsciiParseRagel.rl"
+#line 79 "STLAsciiParseRagel.rl"
 	{ ++lineNum_; /* Count '\n' occurrences */ }
 	goto st34;
 st34:
 	if ( ++p == pe )
 		goto _test_eof34;
 case 34:
-#line 732 "STLAsciiParseRagel.C"
+#line 735 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 85: goto st35;
 		case 117: goto st35;
@@ -832,14 +835,14 @@ case 44:
 		goto tr66;
 	goto tr65;
 tr66:
-#line 76 "STLAsciiParseRagel.rl"
+#line 79 "STLAsciiParseRagel.rl"
 	{ ++lineNum_; /* Count '\n' occurrences */ }
 	goto st45;
 st45:
 	if ( ++p == pe )
 		goto _test_eof45;
 case 45:
-#line 843 "STLAsciiParseRagel.C"
+#line 846 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 10: goto tr66;
 		case 32: goto st45;
@@ -850,14 +853,14 @@ case 45:
 		goto st45;
 	goto tr68;
 tr67:
-#line 76 "STLAsciiParseRagel.rl"
+#line 79 "STLAsciiParseRagel.rl"
 	{ ++lineNum_; /* Count '\n' occurrences */ }
 	goto st46;
 st46:
 	if ( ++p == pe )
 		goto _test_eof46;
 case 46:
-#line 861 "STLAsciiParseRagel.C"
+#line 864 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 69: goto st47;
 		case 101: goto st47;
@@ -928,28 +931,28 @@ case 52:
 		goto st52;
 	goto tr68;
 tr77:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st53;
 st53:
 	if ( ++p == pe )
 		goto _test_eof53;
 case 53:
-#line 939 "STLAsciiParseRagel.C"
+#line 942 "STLAsciiParseRagel.C"
 	if ( (*p) == 46 )
 		goto st54;
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st163;
 	goto tr68;
 tr78:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st54;
 st54:
 	if ( ++p == pe )
 		goto _test_eof54;
 case 54:
-#line 953 "STLAsciiParseRagel.C"
+#line 956 "STLAsciiParseRagel.C"
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st55;
 	goto tr68;
@@ -970,7 +973,7 @@ case 55:
 		goto tr83;
 	goto tr68;
 tr83:
-#line 85 "STLAsciiParseRagel.rl"
+#line 88 "STLAsciiParseRagel.rl"
 	{
         const char saveC = *p;
         *p = '\0';  // Make nul-terminated
@@ -983,7 +986,7 @@ st56:
 	if ( ++p == pe )
 		goto _test_eof56;
 case 56:
-#line 987 "STLAsciiParseRagel.C"
+#line 990 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 9: goto st56;
 		case 32: goto st56;
@@ -998,28 +1001,28 @@ case 56:
 		goto st56;
 	goto tr68;
 tr86:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st57;
 st57:
 	if ( ++p == pe )
 		goto _test_eof57;
 case 57:
-#line 1009 "STLAsciiParseRagel.C"
+#line 1012 "STLAsciiParseRagel.C"
 	if ( (*p) == 46 )
 		goto st58;
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st159;
 	goto tr68;
 tr87:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st58;
 st58:
 	if ( ++p == pe )
 		goto _test_eof58;
 case 58:
-#line 1023 "STLAsciiParseRagel.C"
+#line 1026 "STLAsciiParseRagel.C"
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st59;
 	goto tr68;
@@ -1040,7 +1043,7 @@ case 59:
 		goto tr92;
 	goto tr68;
 tr92:
-#line 85 "STLAsciiParseRagel.rl"
+#line 88 "STLAsciiParseRagel.rl"
 	{
         const char saveC = *p;
         *p = '\0';  // Make nul-terminated
@@ -1053,7 +1056,7 @@ st60:
 	if ( ++p == pe )
 		goto _test_eof60;
 case 60:
-#line 1057 "STLAsciiParseRagel.C"
+#line 1060 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 9: goto st60;
 		case 32: goto st60;
@@ -1068,28 +1071,28 @@ case 60:
 		goto st60;
 	goto tr68;
 tr95:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st61;
 st61:
 	if ( ++p == pe )
 		goto _test_eof61;
 case 61:
-#line 1079 "STLAsciiParseRagel.C"
+#line 1082 "STLAsciiParseRagel.C"
 	if ( (*p) == 46 )
 		goto st62;
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st155;
 	goto tr68;
 tr96:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st62;
 st62:
 	if ( ++p == pe )
 		goto _test_eof62;
 case 62:
-#line 1093 "STLAsciiParseRagel.C"
+#line 1096 "STLAsciiParseRagel.C"
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st63;
 	goto tr68;
@@ -1111,7 +1114,7 @@ case 63:
 		goto tr101;
 	goto tr68;
 tr101:
-#line 85 "STLAsciiParseRagel.rl"
+#line 88 "STLAsciiParseRagel.rl"
 	{
         const char saveC = *p;
         *p = '\0';  // Make nul-terminated
@@ -1124,7 +1127,7 @@ st64:
 	if ( ++p == pe )
 		goto _test_eof64;
 case 64:
-#line 1128 "STLAsciiParseRagel.C"
+#line 1131 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 9: goto st64;
 		case 10: goto st65;
@@ -1134,7 +1137,7 @@ case 64:
 		goto st64;
 	goto tr68;
 tr102:
-#line 85 "STLAsciiParseRagel.rl"
+#line 88 "STLAsciiParseRagel.rl"
 	{
         const char saveC = *p;
         *p = '\0';  // Make nul-terminated
@@ -1147,7 +1150,7 @@ st65:
 	if ( ++p == pe )
 		goto _test_eof65;
 case 65:
-#line 1151 "STLAsciiParseRagel.C"
+#line 1154 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 32: goto tr106;
 		case 86: goto tr107;
@@ -1157,14 +1160,14 @@ case 65:
 		goto tr106;
 	goto tr68;
 tr106:
-#line 76 "STLAsciiParseRagel.rl"
+#line 79 "STLAsciiParseRagel.rl"
 	{ ++lineNum_; /* Count '\n' occurrences */ }
 	goto st66;
 st66:
 	if ( ++p == pe )
 		goto _test_eof66;
 case 66:
-#line 1168 "STLAsciiParseRagel.C"
+#line 1171 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 10: goto tr106;
 		case 32: goto st66;
@@ -1175,14 +1178,14 @@ case 66:
 		goto st66;
 	goto tr68;
 tr107:
-#line 76 "STLAsciiParseRagel.rl"
+#line 79 "STLAsciiParseRagel.rl"
 	{ ++lineNum_; /* Count '\n' occurrences */ }
 	goto st67;
 st67:
 	if ( ++p == pe )
 		goto _test_eof67;
 case 67:
-#line 1186 "STLAsciiParseRagel.C"
+#line 1189 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 69: goto st68;
 		case 101: goto st68;
@@ -1253,28 +1256,28 @@ case 73:
 		goto st73;
 	goto tr68;
 tr116:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st74;
 st74:
 	if ( ++p == pe )
 		goto _test_eof74;
 case 74:
-#line 1264 "STLAsciiParseRagel.C"
+#line 1267 "STLAsciiParseRagel.C"
 	if ( (*p) == 46 )
 		goto st75;
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st151;
 	goto tr68;
 tr117:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st75;
 st75:
 	if ( ++p == pe )
 		goto _test_eof75;
 case 75:
-#line 1278 "STLAsciiParseRagel.C"
+#line 1281 "STLAsciiParseRagel.C"
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st76;
 	goto tr68;
@@ -1295,7 +1298,7 @@ case 76:
 		goto tr122;
 	goto tr68;
 tr122:
-#line 85 "STLAsciiParseRagel.rl"
+#line 88 "STLAsciiParseRagel.rl"
 	{
         const char saveC = *p;
         *p = '\0';  // Make nul-terminated
@@ -1308,7 +1311,7 @@ st77:
 	if ( ++p == pe )
 		goto _test_eof77;
 case 77:
-#line 1312 "STLAsciiParseRagel.C"
+#line 1315 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 9: goto st77;
 		case 32: goto st77;
@@ -1323,28 +1326,28 @@ case 77:
 		goto st77;
 	goto tr68;
 tr125:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st78;
 st78:
 	if ( ++p == pe )
 		goto _test_eof78;
 case 78:
-#line 1334 "STLAsciiParseRagel.C"
+#line 1337 "STLAsciiParseRagel.C"
 	if ( (*p) == 46 )
 		goto st79;
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st147;
 	goto tr68;
 tr126:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st79;
 st79:
 	if ( ++p == pe )
 		goto _test_eof79;
 case 79:
-#line 1348 "STLAsciiParseRagel.C"
+#line 1351 "STLAsciiParseRagel.C"
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st80;
 	goto tr68;
@@ -1365,7 +1368,7 @@ case 80:
 		goto tr131;
 	goto tr68;
 tr131:
-#line 85 "STLAsciiParseRagel.rl"
+#line 88 "STLAsciiParseRagel.rl"
 	{
         const char saveC = *p;
         *p = '\0';  // Make nul-terminated
@@ -1378,7 +1381,7 @@ st81:
 	if ( ++p == pe )
 		goto _test_eof81;
 case 81:
-#line 1382 "STLAsciiParseRagel.C"
+#line 1385 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 9: goto st81;
 		case 32: goto st81;
@@ -1393,28 +1396,28 @@ case 81:
 		goto st81;
 	goto tr68;
 tr134:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st82;
 st82:
 	if ( ++p == pe )
 		goto _test_eof82;
 case 82:
-#line 1404 "STLAsciiParseRagel.C"
+#line 1407 "STLAsciiParseRagel.C"
 	if ( (*p) == 46 )
 		goto st83;
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st143;
 	goto tr68;
 tr135:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st83;
 st83:
 	if ( ++p == pe )
 		goto _test_eof83;
 case 83:
-#line 1418 "STLAsciiParseRagel.C"
+#line 1421 "STLAsciiParseRagel.C"
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st84;
 	goto tr68;
@@ -1436,7 +1439,7 @@ case 84:
 		goto tr140;
 	goto tr68;
 tr140:
-#line 85 "STLAsciiParseRagel.rl"
+#line 88 "STLAsciiParseRagel.rl"
 	{
         const char saveC = *p;
         *p = '\0';  // Make nul-terminated
@@ -1449,7 +1452,7 @@ st85:
 	if ( ++p == pe )
 		goto _test_eof85;
 case 85:
-#line 1453 "STLAsciiParseRagel.C"
+#line 1456 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 9: goto st85;
 		case 10: goto st86;
@@ -1459,7 +1462,7 @@ case 85:
 		goto st85;
 	goto tr68;
 tr141:
-#line 85 "STLAsciiParseRagel.rl"
+#line 88 "STLAsciiParseRagel.rl"
 	{
         const char saveC = *p;
         *p = '\0';  // Make nul-terminated
@@ -1472,7 +1475,7 @@ st86:
 	if ( ++p == pe )
 		goto _test_eof86;
 case 86:
-#line 1476 "STLAsciiParseRagel.C"
+#line 1479 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 32: goto tr145;
 		case 86: goto tr146;
@@ -1482,14 +1485,14 @@ case 86:
 		goto tr145;
 	goto tr68;
 tr145:
-#line 76 "STLAsciiParseRagel.rl"
+#line 79 "STLAsciiParseRagel.rl"
 	{ ++lineNum_; /* Count '\n' occurrences */ }
 	goto st87;
 st87:
 	if ( ++p == pe )
 		goto _test_eof87;
 case 87:
-#line 1493 "STLAsciiParseRagel.C"
+#line 1496 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 10: goto tr145;
 		case 32: goto st87;
@@ -1500,14 +1503,14 @@ case 87:
 		goto st87;
 	goto tr68;
 tr146:
-#line 76 "STLAsciiParseRagel.rl"
+#line 79 "STLAsciiParseRagel.rl"
 	{ ++lineNum_; /* Count '\n' occurrences */ }
 	goto st88;
 st88:
 	if ( ++p == pe )
 		goto _test_eof88;
 case 88:
-#line 1511 "STLAsciiParseRagel.C"
+#line 1514 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 69: goto st89;
 		case 101: goto st89;
@@ -1578,28 +1581,28 @@ case 94:
 		goto st94;
 	goto tr68;
 tr155:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st95;
 st95:
 	if ( ++p == pe )
 		goto _test_eof95;
 case 95:
-#line 1589 "STLAsciiParseRagel.C"
+#line 1592 "STLAsciiParseRagel.C"
 	if ( (*p) == 46 )
 		goto st96;
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st139;
 	goto tr68;
 tr156:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st96;
 st96:
 	if ( ++p == pe )
 		goto _test_eof96;
 case 96:
-#line 1603 "STLAsciiParseRagel.C"
+#line 1606 "STLAsciiParseRagel.C"
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st97;
 	goto tr68;
@@ -1620,7 +1623,7 @@ case 97:
 		goto tr161;
 	goto tr68;
 tr161:
-#line 85 "STLAsciiParseRagel.rl"
+#line 88 "STLAsciiParseRagel.rl"
 	{
         const char saveC = *p;
         *p = '\0';  // Make nul-terminated
@@ -1633,7 +1636,7 @@ st98:
 	if ( ++p == pe )
 		goto _test_eof98;
 case 98:
-#line 1637 "STLAsciiParseRagel.C"
+#line 1640 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 9: goto st98;
 		case 32: goto st98;
@@ -1648,28 +1651,28 @@ case 98:
 		goto st98;
 	goto tr68;
 tr164:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st99;
 st99:
 	if ( ++p == pe )
 		goto _test_eof99;
 case 99:
-#line 1659 "STLAsciiParseRagel.C"
+#line 1662 "STLAsciiParseRagel.C"
 	if ( (*p) == 46 )
 		goto st100;
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st135;
 	goto tr68;
 tr165:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st100;
 st100:
 	if ( ++p == pe )
 		goto _test_eof100;
 case 100:
-#line 1673 "STLAsciiParseRagel.C"
+#line 1676 "STLAsciiParseRagel.C"
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st101;
 	goto tr68;
@@ -1690,7 +1693,7 @@ case 101:
 		goto tr170;
 	goto tr68;
 tr170:
-#line 85 "STLAsciiParseRagel.rl"
+#line 88 "STLAsciiParseRagel.rl"
 	{
         const char saveC = *p;
         *p = '\0';  // Make nul-terminated
@@ -1703,7 +1706,7 @@ st102:
 	if ( ++p == pe )
 		goto _test_eof102;
 case 102:
-#line 1707 "STLAsciiParseRagel.C"
+#line 1710 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 9: goto st102;
 		case 32: goto st102;
@@ -1718,28 +1721,28 @@ case 102:
 		goto st102;
 	goto tr68;
 tr173:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st103;
 st103:
 	if ( ++p == pe )
 		goto _test_eof103;
 case 103:
-#line 1729 "STLAsciiParseRagel.C"
+#line 1732 "STLAsciiParseRagel.C"
 	if ( (*p) == 46 )
 		goto st104;
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st131;
 	goto tr68;
 tr174:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st104;
 st104:
 	if ( ++p == pe )
 		goto _test_eof104;
 case 104:
-#line 1743 "STLAsciiParseRagel.C"
+#line 1746 "STLAsciiParseRagel.C"
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st105;
 	goto tr68;
@@ -1761,7 +1764,7 @@ case 105:
 		goto tr179;
 	goto tr68;
 tr179:
-#line 85 "STLAsciiParseRagel.rl"
+#line 88 "STLAsciiParseRagel.rl"
 	{
         const char saveC = *p;
         *p = '\0';  // Make nul-terminated
@@ -1774,7 +1777,7 @@ st106:
 	if ( ++p == pe )
 		goto _test_eof106;
 case 106:
-#line 1778 "STLAsciiParseRagel.C"
+#line 1781 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 9: goto st106;
 		case 10: goto st107;
@@ -1784,7 +1787,7 @@ case 106:
 		goto st106;
 	goto tr68;
 tr180:
-#line 85 "STLAsciiParseRagel.rl"
+#line 88 "STLAsciiParseRagel.rl"
 	{
         const char saveC = *p;
         *p = '\0';  // Make nul-terminated
@@ -1797,7 +1800,7 @@ st107:
 	if ( ++p == pe )
 		goto _test_eof107;
 case 107:
-#line 1801 "STLAsciiParseRagel.C"
+#line 1804 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 32: goto tr185;
 		case 69: goto tr186;
@@ -1807,14 +1810,14 @@ case 107:
 		goto tr185;
 	goto tr184;
 tr185:
-#line 76 "STLAsciiParseRagel.rl"
+#line 79 "STLAsciiParseRagel.rl"
 	{ ++lineNum_; /* Count '\n' occurrences */ }
 	goto st108;
 st108:
 	if ( ++p == pe )
 		goto _test_eof108;
 case 108:
-#line 1818 "STLAsciiParseRagel.C"
+#line 1821 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 10: goto tr185;
 		case 32: goto st108;
@@ -1825,14 +1828,14 @@ case 108:
 		goto st108;
 	goto tr187;
 tr186:
-#line 76 "STLAsciiParseRagel.rl"
+#line 79 "STLAsciiParseRagel.rl"
 	{ ++lineNum_; /* Count '\n' occurrences */ }
 	goto st109;
 st109:
 	if ( ++p == pe )
 		goto _test_eof109;
 case 109:
-#line 1836 "STLAsciiParseRagel.C"
+#line 1839 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 78: goto st110;
 		case 110: goto st110;
@@ -1903,14 +1906,14 @@ case 116:
 		goto tr198;
 	goto tr197;
 tr198:
-#line 76 "STLAsciiParseRagel.rl"
+#line 79 "STLAsciiParseRagel.rl"
 	{ ++lineNum_; /* Count '\n' occurrences */ }
 	goto st117;
 st117:
 	if ( ++p == pe )
 		goto _test_eof117;
 case 117:
-#line 1914 "STLAsciiParseRagel.C"
+#line 1917 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 10: goto tr198;
 		case 32: goto st117;
@@ -1921,14 +1924,14 @@ case 117:
 		goto st117;
 	goto tr200;
 tr199:
-#line 76 "STLAsciiParseRagel.rl"
+#line 79 "STLAsciiParseRagel.rl"
 	{ ++lineNum_; /* Count '\n' occurrences */ }
 	goto st118;
 st118:
 	if ( ++p == pe )
 		goto _test_eof118;
 case 118:
-#line 1932 "STLAsciiParseRagel.C"
+#line 1935 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 78: goto st119;
 		case 110: goto st119;
@@ -1996,26 +1999,26 @@ case 125:
 		goto tr211;
 	goto tr210;
 tr210:
-#line 81 "STLAsciiParseRagel.rl"
+#line 84 "STLAsciiParseRagel.rl"
 	{ endFacet(); }
 	goto st126;
 st126:
 	if ( ++p == pe )
 		goto _test_eof126;
 case 126:
-#line 2007 "STLAsciiParseRagel.C"
+#line 2010 "STLAsciiParseRagel.C"
 	if ( (*p) == 10 )
 		goto st127;
 	goto st126;
 tr211:
-#line 81 "STLAsciiParseRagel.rl"
+#line 84 "STLAsciiParseRagel.rl"
 	{ endFacet(); }
 	goto st127;
 st127:
 	if ( ++p == pe )
 		goto _test_eof127;
 case 127:
-#line 2019 "STLAsciiParseRagel.C"
+#line 2022 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 32: goto tr28;
 		case 69: goto tr15;
@@ -2060,14 +2063,14 @@ case 130:
 		goto tr179;
 	goto tr68;
 tr175:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st131;
 st131:
 	if ( ++p == pe )
 		goto _test_eof131;
 case 131:
-#line 2071 "STLAsciiParseRagel.C"
+#line 2074 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 9: goto tr179;
 		case 10: goto tr180;
@@ -2115,14 +2118,14 @@ case 134:
 		goto tr170;
 	goto tr68;
 tr166:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st135;
 st135:
 	if ( ++p == pe )
 		goto _test_eof135;
 case 135:
-#line 2126 "STLAsciiParseRagel.C"
+#line 2129 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 9: goto tr170;
 		case 32: goto tr170;
@@ -2169,14 +2172,14 @@ case 138:
 		goto tr161;
 	goto tr68;
 tr157:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st139;
 st139:
 	if ( ++p == pe )
 		goto _test_eof139;
 case 139:
-#line 2180 "STLAsciiParseRagel.C"
+#line 2183 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 9: goto tr161;
 		case 32: goto tr161;
@@ -2224,14 +2227,14 @@ case 142:
 		goto tr140;
 	goto tr68;
 tr136:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st143;
 st143:
 	if ( ++p == pe )
 		goto _test_eof143;
 case 143:
-#line 2235 "STLAsciiParseRagel.C"
+#line 2238 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 9: goto tr140;
 		case 10: goto tr141;
@@ -2279,14 +2282,14 @@ case 146:
 		goto tr131;
 	goto tr68;
 tr127:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st147;
 st147:
 	if ( ++p == pe )
 		goto _test_eof147;
 case 147:
-#line 2290 "STLAsciiParseRagel.C"
+#line 2293 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 9: goto tr131;
 		case 32: goto tr131;
@@ -2333,14 +2336,14 @@ case 150:
 		goto tr122;
 	goto tr68;
 tr118:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st151;
 st151:
 	if ( ++p == pe )
 		goto _test_eof151;
 case 151:
-#line 2344 "STLAsciiParseRagel.C"
+#line 2347 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 9: goto tr122;
 		case 32: goto tr122;
@@ -2388,14 +2391,14 @@ case 154:
 		goto tr101;
 	goto tr68;
 tr97:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st155;
 st155:
 	if ( ++p == pe )
 		goto _test_eof155;
 case 155:
-#line 2399 "STLAsciiParseRagel.C"
+#line 2402 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 9: goto tr101;
 		case 10: goto tr102;
@@ -2443,14 +2446,14 @@ case 158:
 		goto tr92;
 	goto tr68;
 tr88:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st159;
 st159:
 	if ( ++p == pe )
 		goto _test_eof159;
 case 159:
-#line 2454 "STLAsciiParseRagel.C"
+#line 2457 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 9: goto tr92;
 		case 32: goto tr92;
@@ -2497,14 +2500,14 @@ case 162:
 		goto tr83;
 	goto tr68;
 tr79:
-#line 77 "STLAsciiParseRagel.rl"
+#line 80 "STLAsciiParseRagel.rl"
 	{ tok = p; /* Local token start */ }
 	goto st163;
 st163:
 	if ( ++p == pe )
 		goto _test_eof163;
 case 163:
-#line 2508 "STLAsciiParseRagel.C"
+#line 2511 "STLAsciiParseRagel.C"
 	switch( (*p) ) {
 		case 9: goto tr83;
 		case 32: goto tr83;
@@ -2690,7 +2693,7 @@ case 163:
 	{
 	switch ( cs ) {
 	case 164: 
-#line 76 "STLAsciiParseRagel.rl"
+#line 79 "STLAsciiParseRagel.rl"
 	{ ++lineNum_; /* Count '\n' occurrences */ }
 	break;
 	case 1: 
@@ -2700,7 +2703,7 @@ case 163:
 	case 5: 
 	case 6: 
 	case 7: 
-#line 94 "STLAsciiParseRagel.rl"
+#line 97 "STLAsciiParseRagel.rl"
 	{ die("solid", p, pe); }
 	break;
 	case 17: 
@@ -2711,7 +2714,7 @@ case 163:
 	case 22: 
 	case 23: 
 	case 24: 
-#line 95 "STLAsciiParseRagel.rl"
+#line 98 "STLAsciiParseRagel.rl"
 	{ die("endsolid", p, pe); }
 	break;
 	case 25: 
@@ -2721,7 +2724,7 @@ case 163:
 	case 29: 
 	case 30: 
 	case 31: 
-#line 96 "STLAsciiParseRagel.rl"
+#line 99 "STLAsciiParseRagel.rl"
 	{ die("facet", p, pe); }
 	break;
 	case 117: 
@@ -2734,7 +2737,7 @@ case 163:
 	case 124: 
 	case 125: 
 	case 126: 
-#line 97 "STLAsciiParseRagel.rl"
+#line 100 "STLAsciiParseRagel.rl"
 	{ die("endfacet", p, pe); }
 	break;
 	case 33: 
@@ -2748,7 +2751,7 @@ case 163:
 	case 41: 
 	case 42: 
 	case 43: 
-#line 98 "STLAsciiParseRagel.rl"
+#line 101 "STLAsciiParseRagel.rl"
 	{ die("loop", p, pe); }
 	break;
 	case 108: 
@@ -2759,7 +2762,7 @@ case 163:
 	case 113: 
 	case 114: 
 	case 115: 
-#line 99 "STLAsciiParseRagel.rl"
+#line 102 "STLAsciiParseRagel.rl"
 	{ die("endloop", p, pe); }
 	break;
 	case 45: 
@@ -2860,65 +2863,65 @@ case 163:
 	case 161: 
 	case 162: 
 	case 163: 
-#line 100 "STLAsciiParseRagel.rl"
+#line 103 "STLAsciiParseRagel.rl"
 	{ die("vertex", p, pe); }
 	break;
 	case 9: 
 	case 15: 
 	case 16: 
-#line 96 "STLAsciiParseRagel.rl"
+#line 99 "STLAsciiParseRagel.rl"
 	{ die("facet", p, pe); }
-#line 95 "STLAsciiParseRagel.rl"
+#line 98 "STLAsciiParseRagel.rl"
 	{ die("endsolid", p, pe); }
 	break;
 	case 32: 
-#line 96 "STLAsciiParseRagel.rl"
+#line 99 "STLAsciiParseRagel.rl"
 	{ die("facet", p, pe); }
-#line 98 "STLAsciiParseRagel.rl"
+#line 101 "STLAsciiParseRagel.rl"
 	{ die("loop", p, pe); }
 	break;
 	case 44: 
-#line 98 "STLAsciiParseRagel.rl"
+#line 101 "STLAsciiParseRagel.rl"
 	{ die("loop", p, pe); }
-#line 100 "STLAsciiParseRagel.rl"
+#line 103 "STLAsciiParseRagel.rl"
 	{ die("vertex", p, pe); }
 	break;
 	case 116: 
-#line 99 "STLAsciiParseRagel.rl"
+#line 102 "STLAsciiParseRagel.rl"
 	{ die("endloop", p, pe); }
-#line 97 "STLAsciiParseRagel.rl"
+#line 100 "STLAsciiParseRagel.rl"
 	{ die("endfacet", p, pe); }
 	break;
 	case 107: 
-#line 100 "STLAsciiParseRagel.rl"
+#line 103 "STLAsciiParseRagel.rl"
 	{ die("vertex", p, pe); }
-#line 99 "STLAsciiParseRagel.rl"
+#line 102 "STLAsciiParseRagel.rl"
 	{ die("endloop", p, pe); }
 	break;
 	case 8: 
-#line 94 "STLAsciiParseRagel.rl"
+#line 97 "STLAsciiParseRagel.rl"
 	{ die("solid", p, pe); }
-#line 96 "STLAsciiParseRagel.rl"
+#line 99 "STLAsciiParseRagel.rl"
 	{ die("facet", p, pe); }
-#line 95 "STLAsciiParseRagel.rl"
+#line 98 "STLAsciiParseRagel.rl"
 	{ die("endsolid", p, pe); }
 	break;
 	case 127: 
-#line 96 "STLAsciiParseRagel.rl"
+#line 99 "STLAsciiParseRagel.rl"
 	{ die("facet", p, pe); }
-#line 97 "STLAsciiParseRagel.rl"
+#line 100 "STLAsciiParseRagel.rl"
 	{ die("endfacet", p, pe); }
-#line 95 "STLAsciiParseRagel.rl"
+#line 98 "STLAsciiParseRagel.rl"
 	{ die("endsolid", p, pe); }
 	break;
-#line 2915 "STLAsciiParseRagel.C"
+#line 2918 "STLAsciiParseRagel.C"
 	}
 	}
 
 	_out: {}
 	}
 
-#line 255 "STLAsciiParseRagel.rl"
+#line 258 "STLAsciiParseRagel.rl"
        /* ^^^ FSM execution here ^^^ */;
 
         if (0 == cs)
diff --git a/src/fileFormats/stl/STLAsciiParseRagel.rl b/src/fileFormats/stl/STLAsciiParseRagel.rl
index a1cb3a4cf7..c0bada0e0c 100644
--- a/src/fileFormats/stl/STLAsciiParseRagel.rl
+++ b/src/fileFormats/stl/STLAsciiParseRagel.rl
@@ -33,6 +33,9 @@ Description
 #include "STLReader.H"
 #include "OSspecific.H"
 
+// Ragel switch/case logic may have several implicit fallthroughs
+#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+
 // https://en.wikipedia.org/wiki/STL_%28file_format%29#ASCII_STL
 //
 // Format
diff --git a/wmake/rules/General/Gcc/c++ b/wmake/rules/General/Gcc/c++
index c71ca11687..8ac680df3d 100644
--- a/wmake/rules/General/Gcc/c++
+++ b/wmake/rules/General/Gcc/c++
@@ -14,4 +14,5 @@ c++WARN     = \
 
 c++LESSWARN = \
     -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds \
+    -Wno-deprecated-declarations \
     -fpermissive
diff --git a/wmake/src/wmkdepend.cpp b/wmake/src/wmkdepend.cpp
index d60d1fd490..8cb2e39caa 100644
--- a/wmake/src/wmkdepend.cpp
+++ b/wmake/src/wmkdepend.cpp
@@ -73,6 +73,9 @@ Note
 #include <unordered_set>
 #include <vector>
 
+// Ragel switchs may have several implicit fallthroughs
+#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+
 // Length of the input read buffer
 #define INBUFLEN 16384
 
@@ -309,7 +312,7 @@ namespace Files
 // Can use 'variable p xxx;' etc to change these names
 
 
-#line 334 "wmkdepend.rl"
+#line 337 "wmkdepend.rl"
 
 
 
@@ -318,14 +321,14 @@ namespace Files
 //
 
 
-#line 322 "wmkdepend.cpp"
+#line 325 "wmkdepend.cpp"
 static const int wmkdep_start = 21;
 static const int wmkdep_error = 0;
 
 static const int wmkdep_en_main = 21;
 
 
-#line 342 "wmkdepend.rl"
+#line 345 "wmkdepend.rl"
 
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -348,7 +351,7 @@ void processFile(const std::string& fileName)
     int act, cs;
 
     
-#line 352 "wmkdepend.cpp"
+#line 355 "wmkdepend.cpp"
 	{
 	cs = wmkdep_start;
 	ts = 0;
@@ -356,7 +359,7 @@ void processFile(const std::string& fileName)
 	act = 0;
 	}
 
-#line 363 "wmkdepend.rl"
+#line 366 "wmkdepend.rl"
    /* ^^^ FSM initialization here ^^^ */;
 
     // Local token start
@@ -401,7 +404,7 @@ void processFile(const std::string& fileName)
         }
 
         
-#line 405 "wmkdepend.cpp"
+#line 408 "wmkdepend.cpp"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -420,35 +423,35 @@ tr0:
 	}
 	goto st21;
 tr2:
-#line 332 "wmkdepend.rl"
+#line 335 "wmkdepend.rl"
 	{te = p+1;}
 	goto st21;
 tr17:
-#line 332 "wmkdepend.rl"
+#line 335 "wmkdepend.rl"
 	{{p = ((te))-1;}}
 	goto st21;
 tr21:
-#line 327 "wmkdepend.rl"
+#line 330 "wmkdepend.rl"
 	{te = p+1;}
 	goto st21;
 tr29:
-#line 330 "wmkdepend.rl"
+#line 333 "wmkdepend.rl"
 	{te = p+1;}
 	goto st21;
 tr31:
-#line 329 "wmkdepend.rl"
+#line 332 "wmkdepend.rl"
 	{te = p+1;}
 	goto st21;
 tr36:
-#line 324 "wmkdepend.rl"
+#line 327 "wmkdepend.rl"
 	{te = p;p--;}
 	goto st21;
 tr37:
-#line 332 "wmkdepend.rl"
+#line 335 "wmkdepend.rl"
 	{te = p;p--;}
 	goto st21;
 tr38:
-#line 330 "wmkdepend.rl"
+#line 333 "wmkdepend.rl"
 	{te = p;p--;}
 	goto st21;
 st21:
@@ -461,7 +464,7 @@ st21:
 case 21:
 #line 1 "NONE"
 	{ts = p;}
-#line 465 "wmkdepend.cpp"
+#line 468 "wmkdepend.cpp"
 	switch( (*p) ) {
 		case 10: goto st23;
 		case 11: goto tr34;
@@ -482,14 +485,14 @@ case 1:
 tr32:
 #line 1 "NONE"
 	{te = p+1;}
-#line 324 "wmkdepend.rl"
+#line 327 "wmkdepend.rl"
 	{act = 1;}
 	goto st22;
 st22:
 	if ( ++p == pe )
 		goto _test_eof22;
 case 22:
-#line 493 "wmkdepend.cpp"
+#line 496 "wmkdepend.cpp"
 	switch( (*p) ) {
 		case 10: goto st23;
 		case 11: goto tr34;
@@ -511,14 +514,14 @@ case 23:
 tr34:
 #line 1 "NONE"
 	{te = p+1;}
-#line 324 "wmkdepend.rl"
+#line 327 "wmkdepend.rl"
 	{act = 1;}
 	goto st24;
 st24:
 	if ( ++p == pe )
 		goto _test_eof24;
 case 24:
-#line 522 "wmkdepend.cpp"
+#line 525 "wmkdepend.cpp"
 	switch( (*p) ) {
 		case 10: goto st23;
 		case 32: goto tr34;
@@ -616,14 +619,14 @@ case 10:
 	}
 	goto tr12;
 tr12:
-#line 312 "wmkdepend.rl"
+#line 315 "wmkdepend.rl"
 	{ tok = p; /* Local token start */ }
 	goto st11;
 st11:
 	if ( ++p == pe )
 		goto _test_eof11;
 case 11:
-#line 627 "wmkdepend.cpp"
+#line 630 "wmkdepend.cpp"
 	switch( (*p) ) {
 		case 10: goto tr15;
 		case 34: goto tr16;
@@ -632,7 +635,7 @@ case 11:
 tr13:
 #line 1 "NONE"
 	{te = p+1;}
-#line 312 "wmkdepend.rl"
+#line 315 "wmkdepend.rl"
 	{ tok = p; /* Local token start */ }
 	goto st25;
 tr15:
@@ -643,7 +646,7 @@ st25:
 	if ( ++p == pe )
 		goto _test_eof25;
 case 25:
-#line 647 "wmkdepend.cpp"
+#line 650 "wmkdepend.cpp"
 	if ( (*p) == 34 )
 		goto tr19;
 	goto st12;
@@ -655,26 +658,26 @@ case 12:
 		goto tr19;
 	goto st12;
 tr19:
-#line 313 "wmkdepend.rl"
+#line 316 "wmkdepend.rl"
 	{ processFile(std::string(tok, (p - tok))); }
 	goto st13;
 st13:
 	if ( ++p == pe )
 		goto _test_eof13;
 case 13:
-#line 666 "wmkdepend.cpp"
+#line 669 "wmkdepend.cpp"
 	if ( (*p) == 10 )
 		goto tr21;
 	goto st13;
 tr16:
-#line 313 "wmkdepend.rl"
+#line 316 "wmkdepend.rl"
 	{ processFile(std::string(tok, (p - tok))); }
 	goto st14;
 st14:
 	if ( ++p == pe )
 		goto _test_eof14;
 case 14:
-#line 678 "wmkdepend.cpp"
+#line 681 "wmkdepend.cpp"
 	if ( (*p) == 10 )
 		goto tr21;
 	goto st14;
@@ -705,7 +708,7 @@ st26:
 	if ( ++p == pe )
 		goto _test_eof26;
 case 26:
-#line 709 "wmkdepend.cpp"
+#line 712 "wmkdepend.cpp"
 	if ( (*p) == 42 )
 		goto st18;
 	goto st17;
@@ -738,14 +741,14 @@ case 19:
 tr30:
 #line 1 "NONE"
 	{te = p+1;}
-#line 330 "wmkdepend.rl"
+#line 333 "wmkdepend.rl"
 	{act = 4;}
 	goto st27;
 st27:
 	if ( ++p == pe )
 		goto _test_eof27;
 case 27:
-#line 749 "wmkdepend.cpp"
+#line 752 "wmkdepend.cpp"
 	if ( (*p) == 10 )
 		goto tr2;
 	goto st1;
@@ -820,7 +823,7 @@ cs = 0;
 	_out: {}
 	}
 
-#line 406 "wmkdepend.rl"
+#line 409 "wmkdepend.rl"
        /* ^^^ FSM execution here ^^^ */;
 
         if (0 == cs)
diff --git a/wmake/src/wmkdepend.rl b/wmake/src/wmkdepend.rl
index a811f51913..c57b70a8c1 100644
--- a/wmake/src/wmkdepend.rl
+++ b/wmake/src/wmkdepend.rl
@@ -71,6 +71,9 @@ Note
 #include <unordered_set>
 #include <vector>
 
+// Ragel switchs may have several implicit fallthroughs
+#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+
 // Length of the input read buffer
 #define INBUFLEN 16384