--- a/tools/xm2jss.c	Mon Jan 13 21:16:57 2020 +0200
+++ b/tools/xm2jss.c	Mon Jan 13 21:21:25 2020 +0200
@@ -47,16 +47,17 @@
 
 static const DMOptArg optList[] =
 {
-    { 0, '?', "help",           "Show this help", OPT_NONE },
-    { 1, 'v', "verbose",        "Be more verbose", OPT_NONE },
-    { 2, 'i', "ignore",         "Ignore errors", OPT_NONE },
-    { 3, 'p', "patterns",       "Pattern storage mode", OPT_ARGREQ },
-    { 4, 'E', "strip-ext-instr","Strip ext. instruments (implies -I -S)", OPT_NONE },
-    { 5, 'I', "strip-instr",    "Strip instruments (implies -S)", OPT_NONE },
-    { 6, 'S', "strip-samples",  "Strip instr. sampledata", OPT_NONE },
-    { 7, '8', "smode8",         "8-bit sample conversion flags", OPT_ARGREQ },
-    { 8, '1', "smode16",        "16-bit sample conversion flags", OPT_ARGREQ },
-    { 9, 'O', "optimize",       "Optimize module", OPT_NONE },
+    {  0, '?', "help"            , "Show this help", OPT_NONE },
+    {  2, 'v', "verbose"         , "Be more verbose", OPT_NONE },
+
+    { 10, 'i', "ignore"          , "Ignore errors", OPT_NONE },
+    { 12, 'p', "patterns"        , "Pattern storage mode", OPT_ARGREQ },
+    { 14, 'E', "strip-ext-instr" , "Strip ext. instruments (implies -I -S)", OPT_NONE },
+    { 16, 'I', "strip-instr"     , "Strip instruments (implies -S)", OPT_NONE },
+    { 18, 'S', "strip-samples"   , "Strip instr. sampledata", OPT_NONE },
+    { 20, '8', "smode8"          , "8-bit sample conversion flags", OPT_ARGREQ },
+    { 22, '1', "smode16"         , "16-bit sample conversion flags", OPT_ARGREQ },
+    { 24, 'O', "optimize"        , "Optimize module", OPT_NONE },
 };
 
 const int optListN = sizeof(optList) / sizeof(optList[0]);
@@ -86,44 +87,43 @@
 
 BOOL argHandleOpt(const int optN, char *optArg, char *currArg)
 {
-    (void) optArg;
-
     switch (optN)
     {
-    case 0:
-        argShowHelp();
-        exit(0);
-        break;
+        case 0:
+            argShowHelp();
+            exit(0);
+            break;
+
 
-    case 1:
-        dmVerbosity++;
-        break;
+        case 2:
+            dmVerbosity++;
+            break;
 
-    case 2:
-        optIgnoreErrors = TRUE;
-        break;
+        case 10:
+            optIgnoreErrors = TRUE;
+            break;
 
-    case 3:
-        optPatternMode = atoi(optArg);
-        if (optPatternMode <= 0 || optPatternMode >= PATMODE_LAST)
-        {
-            dmErrorMsg("Unknown pattern conversion mode %d\n", optPatternMode);
-            return FALSE;
-        }
-        break;
+        case 12:
+            optPatternMode = atoi(optArg);
+            if (optPatternMode <= 0 || optPatternMode >= PATMODE_LAST)
+            {
+                dmErrorMsg("Unknown pattern conversion mode %d\n", optPatternMode);
+                return FALSE;
+            }
+            break;
 
-    case 4: optStripExtInstr = TRUE; break;
-    case 5: optStripInstr = TRUE; break;
-    case 6: optStripSamples = TRUE; break;
+        case 14: optStripExtInstr = TRUE; break;
+        case 16: optStripInstr = TRUE; break;
+        case 18: optStripSamples = TRUE; break;
 
-    case 7: optSampMode8 = atoi(optArg) & JM_SAMPLE_MODE_MASK; break;
-    case 8: optSampMode16 = atoi(optArg) & JM_SAMPLE_MODE_MASK; break;
+        case 20: optSampMode8 = atoi(optArg) & JM_SAMPLE_MODE_MASK; break;
+        case 22: optSampMode16 = atoi(optArg) & JM_SAMPLE_MODE_MASK; break;
 
-    case 9: optOptimize = TRUE; break;
+        case 24: optOptimize = TRUE; break;
 
-    default:
-        dmErrorMsg("Unimplemented option argument '%s'.\n", currArg);
-        return FALSE;
+        default:
+            dmErrorMsg("Unimplemented option argument '%s'.\n", currArg);
+            return FALSE;
     }
 
     return TRUE;