diff --git a/sourcepawn/compiler/sc1.c b/sourcepawn/compiler/sc1.c
index 3084df53..5c22032a 100644
--- a/sourcepawn/compiler/sc1.c
+++ b/sourcepawn/compiler/sc1.c
@@ -2576,7 +2576,7 @@ static void initials(int ident,int tag,cell *size,int dim[],int numdim,
       /* now initialize the sub-arrays */
       memset(counteddim,0,sizeof counteddim);
       initarray(ident,tag,dim,numdim,0,curlit,counteddim,&lastdim,enumroot,&errorfound);
-      /* check the specified array dimensions with the initialler counts */
+      /* check the specified array dimensions with the initializer counts */
       for (idx=0; idx<numdim-1; idx++) {
         if (dim[idx]==0) {
           dim[idx]=counteddim[idx];
@@ -2637,7 +2637,7 @@ static cell initarray(int ident,int tag,int dim[],int numdim,int cur,
      * to the newly detected sub-array into the indirection table; i.e.
      * this table needs to be expanded and updated.
      * In the current design, the indirection vectors for a multi-dimensional
-     * array are adjusted after parsing all initiallers. Hence, it is only
+     * array are adjusted after parsing all initializers. Hence, it is only
      * necessary at this point to reserve space for an extra cell in the
      * indirection vector.
      */
@@ -2719,7 +2719,7 @@ static cell initvector(int ident,int tag,cell size,int fillzero,
        * zeros, and toggle the tag
        */
       if (enumroot!=NULL && enumfield==NULL)
-        error(227);             /* more initiallers than enum fields */
+        error(227);             /* more initializers than enum fields */
       rtag=tag;                 /* preset, may be overridden by enum field tag */
       if (enumfield!=NULL) {
         cell step;
@@ -2730,7 +2730,7 @@ static cell initvector(int ident,int tag,cell size,int fillzero,
         assert(symfield!=NULL);
         assert(fieldlit<litidx);
         if (litidx-fieldlit>symfield->dim.array.length)
-          error(228);           /* length of initialler exceeds size of the enum field */
+          error(228);           /* length of initializer exceeds size of the enum field */
         if (ellips) {
           step=prev1-prev2;
         } else {
diff --git a/sourcepawn/compiler/sc5.scp b/sourcepawn/compiler/sc5.scp
index 1af2cd33..c6759275 100644
--- a/sourcepawn/compiler/sc5.scp
+++ b/sourcepawn/compiler/sc5.scp
@@ -27,12 +27,12 @@ SC_FUNC int strexpand(char *dest, unsigned char *source, int maxlen, unsigned ch
 /*-*SCPACK start of pair table, do not change or remove this line */
 unsigned char errstr_table[][2] = {
   {101,32}, {111,110}, {116,32}, {105,110}, {97,114}, {116,105}, {100,32}, {115,32}, {101,114}, {101,110}, {133,129}, {97,108}, {37,115}, {34,140}, {141,34}, {117,110},
-  {114,101}, {110,111}, {115,105}, {97,116}, {121,32}, {97,110}, {111,114}, {109,98}, {32,142}, {100,101}, {115,116}, {109,137}, {41,10}, {101,134}, {138,32}, {98,108},
+  {114,101}, {110,111}, {115,105}, {97,116}, {121,32}, {97,110}, {111,114}, {109,98}, {32,142}, {100,101}, {115,116}, {41,10}, {109,137}, {101,134}, {138,32}, {98,108},
   {145,130}, {111,108}, {114,97}, {143,99}, {118,139}, {102,163}, {115,121}, {166,151}, {167,161}, {117,115}, {97,32}, {115,146}, {97,159}, {132,162}, {103,32}, {136,32},
-  {150,32}, {103,117}, {105,134}, {177,155}, {164,178}, {132,179}, {111,102}, {101,120}, {165,158}, {131,180}, {99,104}, {116,104}, {105,135}, {153,102}, {101,100}, {118,132},
+  {150,32}, {103,117}, {105,134}, {177,156}, {164,178}, {132,179}, {111,102}, {101,120}, {165,158}, {131,180}, {99,104}, {116,104}, {105,135}, {153,102}, {101,100}, {118,132},
   {168,152}, {182,32}, {105,172}, {191,194}, {101,135}, {173,148}, {109,97}, {116,111}, {99,129}, {115,10}, {112,144}, {116,97}, {181,130}, {98,128}, {154,147}, {44,32},
-  {40,192}, {132,97}, {169,130}, {189,131}, {152,10}, {101,10}, {208,156}, {109,210}, {195,128}, {34,32}, {129,32}, {139,32}, {104,97}, {105,99}, {100,105}, {146,122},
-  {109,147}, {110,32}, {101,108}, {117,108}, {99,111}, {108,111}, {111,112}, {116,136}, {200,154}, {58,212}, {102,105}, {97,115}, {108,128}, {230,136}, {232,149}, {149,32},
+  {40,192}, {132,97}, {169,130}, {189,131}, {152,10}, {101,10}, {208,155}, {109,210}, {195,128}, {34,32}, {129,32}, {139,32}, {104,97}, {105,99}, {146,122}, {109,147},
+  {110,32}, {100,105}, {101,108}, {117,108}, {99,111}, {108,111}, {111,112}, {116,136}, {200,154}, {58,212}, {102,105}, {97,115}, {108,128}, {230,136}, {232,149}, {149,32},
   {202,171}, {131,174}, {203,174}, {215,205}, {119,105}, {109,112}, {183,240}, {110,117}, {118,128}, {165,138}, {247,151}, {198,148}, {102,150}, {111,32}, {131,32}
 };
 /*-*SCPACK end of pair table, do not change or remove this line */
@@ -136,97 +136,97 @@ static char *errmsg[] = {
 /*095*/  "cannot have required parameters after optional parameters\n"
 #else
   "\267pect\235\307k\211:\230\317bu\202fo\217\206\216\012",
-  "\201l\224\252s\203g\354\316e\233\202(\260\366\201) c\357f\241\345w ea\272 \042c\353e\042\012",
+  "\201l\224\252s\203g\354\316e\234\202(\260\366\201) c\357f\241\345w ea\272 \042c\353e\042\012",
   "\231cl\321\236\301\252\345c\333\330\327appe\204 \376\252\344\365o\217\206\237ock\012",
-  "\371\230 \274\240i\365le\233t\276\012",
+  "\371\230 \274\240i\365le\234t\276\012",
   "\270\373\240\334\370\265t\311",
   "\363a\253gn\235\307 \357\255y\012",
   "\355\223\260c\225\240\315\220\323\276\012",
   "\363\252\356\202\366\201; \353sum\235z\210o\012",
-  "\271\305\337\200(nega\205ve\317z\210\375\260ou\202\301bo\217ds\234",
+  "\271\305\336\200(nega\205ve\317z\210\375\260ou\202\301bo\217ds\233",
   "\271\270\260\231cl\321\212\012",
   "\271out\222d\200\371\311",
   "\271\270c\213l\317\240\252\264add\220s\311",
-  "\221 \211tr\224po\203\202(\221 pu\237\335 \371s\234",
-  "\271\316e\233t; \240\376s\364t\272\012",
-  "\042\275a\343t\331c\353\200\363\273\200l\353\202c\353\200\376s\364t\272 \316e\233t\012",
+  "\221 \211tr\224po\203\202(\221 pu\237\335 \371s\233",
+  "\271\316e\234t; \240\376s\364t\272\012",
+  "\042\275a\343t\331c\353\200\363\273\200l\353\202c\353\200\376s\364t\272 \316e\234t\012",
   "m\343\205p\354\275a\343t\207\376\042s\364t\272\042\012",
   "\217\323\235\300\012",
-  "\203i\205\213iza\236d\223\252\267ce\276\207\231cl\204\235\337\325",
+  "\203i\205\213iza\236d\223\252\267ce\276\207\231cl\204\235\336\325",
   "\240\252lab\342\351",
   "\271\250 nam\200\216\012",
   "\250 \213\220ad\224\323\276\351",
-  "\363l\244u\200(n\201-\356t\234",
-  "\305a\253gn\233\202\363\222\365\354a\253gn\233t\012",
+  "\363l\244u\200(n\201-\356t\233",
+  "\305a\253gn\234\202\363\222\365\354a\253gn\234t\012",
   "\042b\220ak\331\260\042\310t\203ue\331\274ou\202\301\310t\267t\012",
-  "\270head\361\336ff\210\207from pro\307typ\325",
-  "\221 \340\272\361\042#if...\042\012",
+  "\270head\361\341ff\210\207from pro\307typ\325",
+  "\221 \337\272\361\042#if...\042\012",
   "\271\272\321ct\257\356t\012",
   "\271subscrip\202(\240\357\305\260\307\375m\225\224subscripts)\351",
   "\271\366\201\317\353sum\235z\210o\012",
-  "\344\365o\217\206\316e\233\202\240c\345s\235a\202\273\200\211\206\301\352\354(\232\204t\235a\202l\203\200%d\234",
-  "\217k\221w\341\336\220c\205v\325",
-  "\305\203\231x ou\202\301bo\217d\207(\330\216\234",
-  "\305\363\203\231x\235(\330\216\234",
-  "\314do\304\240\334\370\252\275a\343\202\244u\200(\314%d\234",
-  "\314typ\200mis\340\272 (\314%d\234",
-  "e\365t\224\316e\233t\012",
-  "\271\232r\361(po\253\237\224n\201-\347m\203\223\235\232r\203g\234",
+  "\344\365o\217\206\316e\234\202\240c\345s\235a\202\273\200\211\206\301\352\354(\232\204t\235a\202l\203\200%d\233",
+  "\217k\221w\340\341\220c\205v\325",
+  "\305\203\231x ou\202\301bo\217d\207(\330\216\233",
+  "\305\363\203\231x\235(\330\216\233",
+  "\314do\304\240\334\370\252\275a\343\202\244u\200(\314%d\233",
+  "\314typ\200mis\337\272 (\314%d\233",
+  "e\365t\224\316e\234t\012",
+  "\271\232r\361(po\253\237\224n\201-\347m\203\223\235\232r\203g\233",
   "\267t\242 \272\321c\347\207\332l\203\325",
-  "\356\202\250 \334\207\221 \337\325",
-  "dupl\335\223\200\042c\353e\331lab\342 (\244u\200%d\234",
-  "\271\342lip\222s\317\305\337\200\274\240k\221wn\012",
+  "\356\202\250 \334\207\221 \336\325",
+  "dupl\335\223\200\042c\353e\331lab\342 (\244u\200%d\233",
+  "\271\342lip\222s\317\305\336\200\274\240k\221wn\012",
   "\271\344\227\203a\236\301cl\353\207speci\352\210\311",
   "\272\321ct\257\356\202\267ce\276\207r\225g\200f\260pack\235\232r\203g\012",
   "po\222\212\333p\321me\347\207\327\312c\276\200\213l nam\235p\321me\347\311",
   "\307\375m\225\224\270\265t\311",
-  "\217k\221w\341\305\337\200(\330\216\234",
-  "\305\337\304d\375\240\340\272\317\260\231\232\203a\236\305\274\307\375sm\213l\012",
-  "\305\336\233\222\201\207d\375\240\340\272\012",
+  "\217k\221w\340\305\336\200(\330\216\233",
+  "\305\336\304d\375\240\337\272\317\260\231\232\203a\236\305\274\307\375sm\213l\012",
+  "\305(\207d\375\240\337\272\012",
   "\271l\203\200\310t\203ua\212\012",
   "\271r\225g\325",
-  "\271subscript\317\251\200\042[ ]\331\355\223\226\207\332\306j\260\336\233\222\201\311",
-  "m\343\205-\336\233\222\201\333\255y\207\363f\343l\224\203i\205\213iz\276\012",
-  "\267ce\276\361\306ximum \372\257\301\336\233\222\201\311",
-  "\217\340\272\235c\345s\361b\242c\200(\042}\042\234",
+  "\271subscript\317\251\200\042[ ]\331\355\223\226\207\332\306j\260\341\234\222\201\311",
+  "m\343\205-\341\234\222\201\333\255y\207\363f\343l\224\203i\205\213iz\276\012",
+  "\267ce\276\361\306ximum \372\257\301\341\234\222\201\311",
+  "\217\337\272\235c\345s\361b\242c\200(\042}\042\233",
   "\232\204\202\301\270bod\224\364\273ou\202\270head\210\012",
-  "\255ys\317\345c\333\303\304\225\206\270\265t\207c\225\240\315pu\237\335 (\330\216\234",
-  "\217f\203ish\235\366\332be\374\200\344\365il\257\336\220c\205v\325",
+  "\255ys\317\345c\333\303\304\225\206\270\265t\207c\225\240\315pu\237\335 (\330\216\233",
+  "\217f\203ish\235\366\332be\374\200\344\365il\257\341\220c\205v\325",
   "dupl\335\223\200\265t; sam\200\314\274p\353s\235tw\335\325",
-  "\270\314\373\240\334\370\252\275a\343\202\244u\200(\330\216\234",
-  "m\343\205p\354\042#\342se\331\336\220c\205v\304betwe\211 \042#if ... #\211\336f\042\012",
-  "\042#\342seif\331\336\220c\205\370f\241\345w\207\357\042#\342se\331\336\220c\205v\325",
+  "\270\314\373\240\334\370\252\275a\343\202\244u\200(\330\216\233",
+  "m\343\205p\354\042#\342se\331\341\220c\205v\304betwe\211 \042#if ... #\211\341f\042\012",
+  "\042#\342seif\331\341\220c\205\370f\241\345w\207\357\042#\342se\331\341\220c\205v\325",
   "\372\257\301\355\225d\207do\304\240\352\202\273\200\355\223\226\012",
   "\270\220s\343\202\362\301\355\223\226\230 \363\216\012",
   "c\225\240\272\225g\200\312\323\235\355\223\226\311",
-  "\270\314\373\201l\224\334\370\252s\203g\354\362(\314%d\234",
-  "\270\314\373\240\315\252\220f\210\211c\200\314\260\357\305(\314\216\234",
-  "\330c\225\240\315bo\273 \252\220f\210\211c\200\225\206\357\305(\330\216\234",
+  "\270\314\373\201l\224\334\370\252s\203g\354\362(\314%d\233",
+  "\270\314\373\240\315\252\220f\210\211c\200\314\260\357\305(\314\216\233",
+  "\330c\225\240\315bo\273 \252\220f\210\211c\200\225\206\357\305(\330\216\233",
   "\271\242\212\333\372\257\312ci\222\332\376#p\242g\306\012",
   "\242\212\333\372\257\374\306\202\213\220ad\224\323\276\012",
   "\242\212\333\372\257supp\226\202wa\207\240\211\254\276\012",
-  "\251\210-\323\235\355\223\260\363\231cl\204\235be\374\200\251\200(\371\230\234",
-  "\042\337e\266\331\355\223\260\274\271\332\042\371\331\250\311",
-  "\270\314\363\357\305(\314\216\234",
-  "#\323\200p\223\347\341\327\232\204\202\364\273 \357\213p\334be\205c \272\321c\347\012",
-  "\203pu\202l\203\200\307\375l\201\256(aft\257subs\205tu\212s\234",
+  "\251\210-\323\235\355\223\260\363\231cl\204\235be\374\200\251\200(\371\230\233",
+  "\042\336e\266\331\355\223\260\274\271\332\042\371\331\250\311",
+  "\270\314\363\357\305(\314\216\233",
+  "#\323\200p\223\347\340\327\232\204\202\364\273 \357\213p\334be\205c \272\321c\347\012",
+  "\203pu\202l\203\200\307\375l\201\256(aft\257subs\205tu\212s\233",
   "\246n\313x \210r\260\376\273\200\366\201\317\260\271\270c\213l\012",
   "m\213\374m\235UTF-8 \211\344d\203g\317\260c\226rupt\235\352le: \214\012",
-  "\270\251\304bo\273 \042\220turn\331\225\206\042\220tur\341<\244ue>\042\012",
-  "\203\310\222\232\211\202\220tur\341typ\304(\305& n\201-\255y\234",
-  "\217k\221w\341\250\317\260\240\252\356\202\250 \326",
+  "\270\251\304bo\273 \042\220turn\331\225\206\042\220tur\340<\244ue>\042\012",
+  "\203\310\222\232\211\202\220tur\340typ\304(\305& n\201-\255y\233",
+  "\217k\221w\340\250\317\260\240\252\356\202\250 \326",
   "c\225\240\313k\200\252\362a\207\252\275a\343\202\244u\200f\260\357\203\231x\235\305p\321met\257\326",
   "\251\210-\323\235\355\223\226\207\225\206na\205\370\371\207\373\240\334\370\316e\311",
-  "\252\270\260\330\373\201l\224b\342\201\256\307 \252s\203g\354au\307\340\332\326",
-  "\316\200\310fl\335t: \201\200\301\273\200\316\304\274\213\220ad\224a\253gn\235\307 a\221\273\257i\365le\233\313\236\326",
+  "\252\270\260\330\373\201l\224b\342\201\256\307 \252s\203g\354au\307\337\332\326",
+  "\316\200\310fl\335t: \201\200\301\273\200\316\304\274\213\220ad\224a\253gn\235\307 a\221\273\257i\365le\234\313\236\326",
   "\221 \316\304\204\200\323\235f\260\300\012",
-  "\217k\221w\341au\307\340\201\324",
-  "\217k\221w\341\316\200\216 f\260au\307\340\201\324",
+  "\217k\221w\340au\307\337\201\324",
+  "\217k\221w\340\316\200\216 f\260au\307\337\201\324",
   "pu\237\335 \303\304\225\206\345c\333\303\304\373\240\334\370\316\304\326",
   "\316\200\303\304\373\240\315\203i\205\213iz\235\326",
-  "pu\237\335 \371\207\373\240\220tur\341\255y\207\326",
+  "pu\237\335 \371\207\373\240\220tur\340\255y\207\326",
   "a\227i\261ou\207\356t; \362ov\210rid\200\274\220qui\220\206\326",
-  "\372\257\301\265t\207do\304\240\340\272 \323i\212\012",
+  "\372\257\301\265t\207do\304\240\337\272 \323i\212\012",
   "\267pect\235\362nam\200id\211\205\352\210\012",
   "\270\211um\210a\236\220qui\220\207\217iqu\200\313g\012",
   "c\225\240\334\370\220qui\220\206p\321me\347\207aft\257\346\212\333p\321me\347\311"
@@ -260,7 +260,7 @@ static char *fatalmsg[] = {
   "\203suff\335i\211\202mem\226y\012",
   "\271\353se\227l\257\203\232ruc\212\324",
   "\367m\210\335 ov\210f\345w\317\267ce\276\361capacity\012",
-  "\344\365il\235scrip\202\267ce\276\207\273\200\306ximum mem\226\224\337\200(%l\206bytes\234",
+  "\344\365il\235scrip\202\267ce\276\207\273\200\306ximum mem\226\224\336\200(%l\206bytes\233",
   "\307\375m\225\224\210r\260messag\304\332\201\200l\203\325",
   "\344\231pag\200\306pp\361\352\354\240fo\217d\012",
   "\271p\223h\351",
@@ -298,8 +298,8 @@ static char *warnmsg[] = {
 /*224*/  "indeterminate array size in \"sizeof\" expression (symbol \"%s\")\n",
 /*225*/  "unreachable code\n",
 /*226*/  "a variable is assigned to itself (symbol \"%s\")\n",
-/*227*/  "more initiallers than enum fields\n",
-/*228*/  "length of initialler exceeds size of the enum field\n",
+/*227*/  "more initializers than enum fields\n",
+/*228*/  "length of initializer exceeds size of the enum field\n",
 /*229*/  "index tag mismatch (symbol \"%s\")\n",
 /*230*/  "no implementation for state \"%s\" in function \"%s\", no fall-back\n",
 /*231*/  "state specification on forward declaration is ignored\n",
@@ -311,40 +311,40 @@ static char *warnmsg[] = {
 #else
   "\300 \274tr\243\223\235\307 %\206\272\321c\347\311",
   "\220\323i\236\301\356t/\306cr\375\326",
-  "\372\257\301\265t\207do\304\240\340\272 \323i\212\012",
+  "\372\257\301\265t\207do\304\240\337\272 \323i\212\012",
   "\250 \274nev\257\251\276\351",
   "\250 \274a\253gn\235\252\244u\200\273a\202\274nev\257\251\276\351",
   "\220d\217d\225\202\344\231: \356\202\366\332\274z\210o\012",
   "\220d\217d\225\202te\232: \356\202\366\332\274n\201-z\210o\012",
-  "\217k\221w\341#p\242g\306\012",
+  "\217k\221w\340#p\242g\306\012",
   "\270\364\273 \362\220s\343\202\251\235be\374\200\323i\212\317\374c\361\220p\204s\325",
-  "\371\230 sho\343\206\220tur\341\252\244u\325",
+  "\371\230 sho\343\206\220tur\340\252\244u\325",
   "po\253\237\200\251\200\301\250 be\374\200\203i\205\213iza\212\351",
-  "po\253\237\224\217\203t\211\231\206a\253gn\233t\012",
+  "po\253\237\224\217\203t\211\231\206a\253gn\234t\012",
   "po\253\237\224\217\203t\211\231\206bit\364s\200\355a\212\012",
-  "\362mis\340\272\012",
+  "\362mis\337\272\012",
   "po\253\237\224\252\042\350\331\305\314wa\207\203t\211\231d\351",
   "\366\332\334\207\221 effect\012",
-  "ne\232\235\344m\233t\012",
+  "ne\232\235\344m\234t\012",
   "\345os\200\203d\211\313\212\012",
   "\241\206\232y\354pro\307typ\304\251\235\364\273 \346\212\333sem\335\241umn\311",
   "\345c\333\330\216 s\334dow\207\252\330a\202\252\312c\276\361lev\342\012",
   "\366\332\364\273 \362ov\210rid\200\327appe\204 betwe\211 p\204\211\273ese\311",
   "lab\342 nam\200\216 s\334dow\207\362nam\325",
-  "\372\257\301\336git\207\267ce\276\207\242\212\333\372\257\312ci\222\201\012",
-  "\220d\217d\225\202\042\337e\266\042: \314\337\200\274\213way\2071 \326",
-  "\203\231\347m\203\223\200\305\337\200\376\042\337e\266\331\366\332\326",
+  "\372\257\301\341git\207\267ce\276\207\242\212\333\372\257\312ci\222\201\012",
+  "\220d\217d\225\202\042\336e\266\042: \314\336\200\274\213way\2071 \326",
+  "\203\231\347m\203\223\200\305\336\200\376\042\336e\266\331\366\332\326",
   "\217\220a\272\254\200\344\231\012",
   "\252\330\274a\253gn\235\307 its\342f \326",
-  "m\226\200\203i\205\213l\210\207\273\357\211um \352\342d\311",
-  "l\211g\273 \301\203i\205\213l\257\267ce\276\207\337\200\301\273\200\211um \352\342d\012",
-  "\203\231x \362mis\340\272 \326",
-  "\221 i\365le\233\313\236f\260\316\200\216 \376\371\230\317\221 f\213l-back\012",
+  "m\226\200\203i\205\213iz\210\207\273\357\211um \352\342d\311",
+  "l\211g\273 \301\203i\205\213iz\257\267ce\276\207\336\200\301\273\200\211um \352\342d\012",
+  "\203\231x \362mis\337\272 \326",
+  "\221 i\365le\234\313\236f\260\316\200\216 \376\371\230\317\221 f\213l-back\012",
   "\316\200specif\335a\236\332\374w\204\206\231cl\321\236\274ig\221\220d\012",
-  "outpu\202\352\354\274writt\211\317bu\202\364\273 \344\365ac\202\211\344d\361\336s\254\276\012",
+  "outpu\202\352\354\274writt\211\317bu\202\364\273 \344\365ac\202\211\344d\361\341s\254\276\012",
   "\316\200\330\216 s\334dow\207\252g\345b\333\303\325",
   "\270\274\231\312c\223\235\320) \214\012",
   "pu\237\335 \270lack\207\374w\204\206\231cl\321\236\326",
-  "\217k\221w\341p\321met\257\376subs\205tu\236(\203c\226\220c\202#\323\200p\223\347n\234"
+  "\217k\221w\340p\321met\257\376subs\205tu\236(\203c\226\220c\202#\323\200p\223\347n\233"
 #endif
        };