Index: trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp
===================================================================
--- trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp	(revision 18779)
+++ trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp	(revision 18780)
@@ -1,5 +1,5 @@
 /* $Id$ */
 /** @file
- * VBoxManage - Implementation of -modifyvm command.
+ * VBoxManage - Implementation of modifyvm command.
  */
 
@@ -141,5 +141,6 @@
     for (int i = 1; i < a->argc; i++)
     {
-        if (strcmp(a->argv[i], "-name") == 0)
+        if (   !strcmp(a->argv[i], "--name")
+            || !strcmp(a->argv[i], "-name"))
         {
             if (a->argc <= i + 1)
@@ -148,5 +149,6 @@
             name = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-ostype") == 0)
+        else if (   !strcmp(a->argv[i], "--ostype")
+                 || !strcmp(a->argv[i], "-ostype"))
         {
             if (a->argc <= i + 1)
@@ -155,5 +157,6 @@
             ostype = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-memory") == 0)
+        else if (   !strcmp(a->argv[i], "--memory")
+                 || !strcmp(a->argv[i], "-memory"))
         {
             if (a->argc <= i + 1)
@@ -162,5 +165,6 @@
             memorySize = RTStrToUInt32(a->argv[i]);
         }
-        else if (strcmp(a->argv[i], "-vram") == 0)
+        else if (   !strcmp(a->argv[i], "--vram")
+                 || !strcmp(a->argv[i], "-vram"))
         {
             if (a->argc <= i + 1)
@@ -169,5 +173,6 @@
             vramSize = RTStrToUInt32(a->argv[i]);
         }
-        else if (strcmp(a->argv[i], "-acpi") == 0)
+        else if (   !strcmp(a->argv[i], "--acpi")
+                 || !strcmp(a->argv[i], "-acpi"))
         {
             if (a->argc <= i + 1)
@@ -176,5 +181,6 @@
             acpi = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-ioapic") == 0)
+        else if (   !strcmp(a->argv[i], "--ioapic")
+                 || !strcmp(a->argv[i], "-ioapic"))
         {
             if (a->argc <= i + 1)
@@ -183,5 +189,6 @@
             ioapic = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-hwvirtex") == 0)
+        else if (   !strcmp(a->argv[i], "--hwvirtex")
+                 || !strcmp(a->argv[i], "-hwvirtex"))
         {
             if (a->argc <= i + 1)
@@ -190,5 +197,6 @@
             hwvirtex = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-nestedpaging") == 0)
+        else if (   !strcmp(a->argv[i], "--nestedpaging")
+                 || !strcmp(a->argv[i], "-nestedpaging"))
         {
             if (a->argc <= i + 1)
@@ -197,5 +205,6 @@
             nestedpaging = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-vtxvpid") == 0)
+        else if (   !strcmp(a->argv[i], "--vtxvpid")
+                 || !strcmp(a->argv[i], "-vtxvpid"))
         {
             if (a->argc <= i + 1)
@@ -204,5 +213,6 @@
             vtxvpid = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-pae") == 0)
+        else if (   !strcmp(a->argv[i], "--pae")
+                 || !strcmp(a->argv[i], "-pae"))
         {
             if (a->argc <= i + 1)
@@ -211,5 +221,6 @@
             pae = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-monitorcount") == 0)
+        else if (   !strcmp(a->argv[i], "--monitorcount")
+                 || !strcmp(a->argv[i], "-monitorcount"))
         {
             if (a->argc <= i + 1)
@@ -218,5 +229,6 @@
             monitorcount = RTStrToUInt32(a->argv[i]);
         }
-        else if (strcmp(a->argv[i], "-accelerate3d") == 0)
+        else if (   !strcmp(a->argv[i], "--accelerate3d")
+                 || !strcmp(a->argv[i], "-accelerate3d"))
         {
             if (a->argc <= i + 1)
@@ -225,5 +237,6 @@
             accelerate3d = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-bioslogofadein") == 0)
+        else if (   !strcmp(a->argv[i], "--bioslogofadein")
+                 || !strcmp(a->argv[i], "-bioslogofadein"))
         {
             if (a->argc <= i + 1)
@@ -232,5 +245,6 @@
             bioslogofadein = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-bioslogofadeout") == 0)
+        else if (   !strcmp(a->argv[i], "--bioslogofadeout")
+                 || !strcmp(a->argv[i], "-bioslogofadeout"))
         {
             if (a->argc <= i + 1)
@@ -239,5 +253,6 @@
             bioslogofadeout = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-bioslogodisplaytime") == 0)
+        else if (   !strcmp(a->argv[i], "--bioslogodisplaytime")
+                 || !strcmp(a->argv[i], "-bioslogodisplaytime"))
         {
             if (a->argc <= i + 1)
@@ -246,5 +261,6 @@
             bioslogodisplaytime = RTStrToUInt32(a->argv[i]);
         }
-        else if (strcmp(a->argv[i], "-bioslogoimagepath") == 0)
+        else if (   !strcmp(a->argv[i], "--bioslogoimagepath")
+                 || !strcmp(a->argv[i], "-bioslogoimagepath"))
         {
             if (a->argc <= i + 1)
@@ -253,5 +269,6 @@
             bioslogoimagepath = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-biosbootmenu") == 0)
+        else if (   !strcmp(a->argv[i], "--biosbootmenu")
+                 || !strcmp(a->argv[i], "-biosbootmenu"))
         {
             if (a->argc <= i + 1)
@@ -260,5 +277,6 @@
             biosbootmenumode = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-biossystemtimeoffset") == 0)
+        else if (   !strcmp(a->argv[i], "--biossystemtimeoffset")
+                 || !strcmp(a->argv[i], "-biossystemtimeoffset"))
         {
             if (a->argc <= i + 1)
@@ -267,5 +285,6 @@
             biossystemtimeoffset = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-biospxedebug") == 0)
+        else if (   !strcmp(a->argv[i], "--biospxedebug")
+                 || !strcmp(a->argv[i], "-biospxedebug"))
         {
             if (a->argc <= i + 1)
@@ -274,31 +293,32 @@
             biospxedebug = a->argv[i];
         }
-        else if (strncmp(a->argv[i], "-boot", 5) == 0)
+        else if (   !strncmp(a->argv[i], "--boot", 6)
+                 || !strncmp(a->argv[i], "-boot", 5))
         {
             uint32_t n = 0;
-            if (!a->argv[i][5])
+            if (!a->argv[i][5 + (a->argv[i][1] == '-')])
                 return errorSyntax(USAGE_MODIFYVM, "Missing boot slot number in '%s'", a->argv[i]);
-            if (VINF_SUCCESS != RTStrToUInt32Full(&a->argv[i][5], 10, &n))
+            if (VINF_SUCCESS != RTStrToUInt32Full(&a->argv[i][5 + (a->argv[i][1] == '-')], 10, &n))
                 return errorSyntax(USAGE_MODIFYVM, "Invalid boot slot number in '%s'", a->argv[i]);
             if (a->argc <= i + 1)
                 return errorArgument("Missing argument to '%s'", a->argv[i]);
             i++;
-            if (strcmp(a->argv[i], "none") == 0)
+            if (!strcmp(a->argv[i], "none"))
             {
                 bootDevice[n - 1] = DeviceType_Null;
             }
-            else if (strcmp(a->argv[i], "floppy") == 0)
+            else if (!strcmp(a->argv[i], "floppy"))
             {
                 bootDevice[n - 1] = DeviceType_Floppy;
             }
-            else if (strcmp(a->argv[i], "dvd") == 0)
+            else if (!strcmp(a->argv[i], "dvd"))
             {
                 bootDevice[n - 1] = DeviceType_DVD;
             }
-            else if (strcmp(a->argv[i], "disk") == 0)
+            else if (!strcmp(a->argv[i], "disk"))
             {
                 bootDevice[n - 1] = DeviceType_HardDisk;
             }
-            else if (strcmp(a->argv[i], "net") == 0)
+            else if (!strcmp(a->argv[i], "net"))
             {
                 bootDevice[n - 1] = DeviceType_Network;
@@ -309,5 +329,6 @@
             bootDeviceChanged[n - 1] = true;
         }
-        else if (strcmp(a->argv[i], "-hda") == 0)
+        else if (   !strcmp(a->argv[i], "--hda")
+                 || !strcmp(a->argv[i], "-hda"))
         {
             if (a->argc <= i + 1)
@@ -316,5 +337,6 @@
             hdds[0] = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-hdb") == 0)
+        else if (   !strcmp(a->argv[i], "--hdb")
+                 || !strcmp(a->argv[i], "-hdb"))
         {
             if (a->argc <= i + 1)
@@ -323,5 +345,6 @@
             hdds[1] = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-hdd") == 0)
+        else if (   !strcmp(a->argv[i], "--hdd")
+                 || !strcmp(a->argv[i], "-hdd"))
         {
             if (a->argc <= i + 1)
@@ -330,5 +353,6 @@
             hdds[2] = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-dvd") == 0)
+        else if (   !strcmp(a->argv[i], "--dvd")
+                 || !strcmp(a->argv[i], "-dvd"))
         {
             if (a->argc <= i + 1)
@@ -337,5 +361,6 @@
             dvd = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-dvdpassthrough") == 0)
+        else if (   !strcmp(a->argv[i], "--dvdpassthrough")
+                 || !strcmp(a->argv[i], "-dvdpassthrough"))
         {
             if (a->argc <= i + 1)
@@ -344,5 +369,6 @@
             dvdpassthrough = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-idecontroller") == 0)
+        else if (   !strcmp(a->argv[i], "--idecontroller")
+                 || !strcmp(a->argv[i], "-idecontroller"))
         {
             if (a->argc <= i + 1)
@@ -351,5 +377,6 @@
             idecontroller = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-floppy") == 0)
+        else if (   !strcmp(a->argv[i], "--floppy")
+                 || !strcmp(a->argv[i], "-floppy"))
         {
             if (a->argc <= i + 1)
@@ -358,5 +385,6 @@
             floppy = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-audio") == 0)
+        else if (   !strcmp(a->argv[i], "--audio")
+                 || !strcmp(a->argv[i], "-audio"))
         {
             if (a->argc <= i + 1)
@@ -365,5 +393,6 @@
             audio = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-audiocontroller") == 0)
+        else if (   !strcmp(a->argv[i], "--audiocontroller")
+                 || !strcmp(a->argv[i], "-audiocontroller"))
         {
             if (a->argc <= i + 1)
@@ -372,5 +401,6 @@
             audiocontroller = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-clipboard") == 0)
+        else if (   !strcmp(a->argv[i], "--clipboard")
+                 || !strcmp(a->argv[i], "-clipboard"))
         {
             if (a->argc <= i + 1)
@@ -379,7 +409,8 @@
             clipboard = a->argv[i];
         }
-        else if (strncmp(a->argv[i], "-cableconnected", 15) == 0)
-        {
-            unsigned n = parseNum(&a->argv[i][15], NetworkAdapterCount, "NIC");
+        else if (   !strncmp(a->argv[i], "--cableconnected", 16)
+                 || !strncmp(a->argv[i], "-cableconnected", 15))
+        {
+            unsigned n = parseNum(&a->argv[i][15 + (a->argv[i][1] == '-')], NetworkAdapterCount, "NIC");
             if (!n)
                 return 1;
@@ -391,8 +422,9 @@
             i++;
         }
-        /* watch for the right order of these -nic* comparisons! */
-        else if (strncmp(a->argv[i], "-nictracefile", 13) == 0)
-        {
-            unsigned n = parseNum(&a->argv[i][13], NetworkAdapterCount, "NIC");
+        /* watch for the right order of these --nic* comparisons! */
+        else if (   !strncmp(a->argv[i], "--nictracefile", 14)
+                 || !strncmp(a->argv[i], "-nictracefile", 13))
+        {
+            unsigned n = parseNum(&a->argv[i][13 + (a->argv[i][1] == '-')], NetworkAdapterCount, "NIC");
             if (!n)
                 return 1;
@@ -404,7 +436,8 @@
             i++;
         }
-        else if (strncmp(a->argv[i], "-nictrace", 9) == 0)
-        {
-            unsigned n = parseNum(&a->argv[i][9], NetworkAdapterCount, "NIC");
+        else if (   !strncmp(a->argv[i], "--nictrace", 10)
+                 || !strncmp(a->argv[i], "-nictrace", 9))
+        {
+            unsigned n = parseNum(&a->argv[i][9 + (a->argv[i][1] == '-')], NetworkAdapterCount, "NIC");
             if (!n)
                 return 1;
@@ -414,7 +447,8 @@
             i++;
         }
-        else if (strncmp(a->argv[i], "-nictype", 8) == 0)
-        {
-            unsigned n = parseNum(&a->argv[i][8], NetworkAdapterCount, "NIC");
+        else if (   !strncmp(a->argv[i], "--nictype", 9)
+                 || !strncmp(a->argv[i], "-nictype", 8))
+        {
+            unsigned n = parseNum(&a->argv[i][8 + (a->argv[i][1] == '-')], NetworkAdapterCount, "NIC");
             if (!n)
                 return 1;
@@ -424,7 +458,8 @@
             i++;
         }
-        else if (strncmp(a->argv[i], "-nicspeed", 9) == 0)
-        {
-            unsigned n = parseNum(&a->argv[i][9], NetworkAdapterCount, "NIC");
+        else if (   !strncmp(a->argv[i], "--nicspeed", 10)
+                 || !strncmp(a->argv[i], "-nicspeed", 9))
+        {
+            unsigned n = parseNum(&a->argv[i][9 + (a->argv[i][1] == '-')], NetworkAdapterCount, "NIC");
             if (!n)
                 return 1;
@@ -434,7 +469,8 @@
             i++;
         }
-        else if (strncmp(a->argv[i], "-nic", 4) == 0)
-        {
-            unsigned n = parseNum(&a->argv[i][4], NetworkAdapterCount, "NIC");
+        else if (   !strncmp(a->argv[i], "--nic", 5)
+                 || !strncmp(a->argv[i], "-nic", 4))
+        {
+            unsigned n = parseNum(&a->argv[i][4 + (a->argv[i][1] == '-')], NetworkAdapterCount, "NIC");
             if (!n)
                 return 1;
@@ -444,7 +480,8 @@
             i++;
         }
-        else if (strncmp(a->argv[i], "-hostifdev", 10) == 0) /* backward compatibility */
-        {
-            unsigned n = parseNum(&a->argv[i][10], NetworkAdapterCount, "NIC");
+        else if (   !strncmp(a->argv[i], "--hostifdev", 11)
+                 || !strncmp(a->argv[i], "-hostifdev", 10)) /* backward compatibility */
+        {
+            unsigned n = parseNum(&a->argv[i][10 + (a->argv[i][1] == '-')], NetworkAdapterCount, "NIC");
             if (!n)
                 return 1;
@@ -454,7 +491,8 @@
             i++;
         }
-        else if (  strncmp(a->argv[i], "-bridgeadapter", 14) == 0)
-        {
-            unsigned n = parseNum(&a->argv[i][14], NetworkAdapterCount, "NIC");
+        else if (   !strncmp(a->argv[i], "--bridgeadapter", 15)
+                 || !strncmp(a->argv[i], "-bridgeadapter", 14))
+        {
+            unsigned n = parseNum(&a->argv[i][14 + (a->argv[i][1] == '-')], NetworkAdapterCount, "NIC");
             if (!n)
                 return 1;
@@ -465,7 +503,8 @@
         }
 #if defined(VBOX_WITH_NETFLT)
-        else if (strncmp(a->argv[i], "-hostonlyadapter", 16) == 0)
-        {
-            unsigned n = parseNum(&a->argv[i][16], NetworkAdapterCount, "NIC");
+        else if (   !strncmp(a->argv[i], "--hostonlyadapter", 17)
+                 || !strncmp(a->argv[i], "-hostonlyadapter", 16))
+        {
+            unsigned n = parseNum(&a->argv[i][16 + (a->argv[i][1] == '-')], NetworkAdapterCount, "NIC");
             if (!n)
                 return 1;
@@ -476,7 +515,8 @@
         }
 #endif
-        else if (strncmp(a->argv[i], "-intnet", 7) == 0)
-        {
-            unsigned n = parseNum(&a->argv[i][7], NetworkAdapterCount, "NIC");
+        else if (   !strncmp(a->argv[i], "--intnet", 8)
+                 || !strncmp(a->argv[i], "-intnet", 7))
+        {
+            unsigned n = parseNum(&a->argv[i][7 + (a->argv[i][1] == '-')], NetworkAdapterCount, "NIC");
             if (!n)
                 return 1;
@@ -486,7 +526,8 @@
             i++;
         }
-        else if (strncmp(a->argv[i], "-natnet", 7) == 0)
-        {
-            unsigned n = parseNum(&a->argv[i][7], NetworkAdapterCount, "NIC");
+        else if (   !strncmp(a->argv[i], "--natnet", 8)
+                 || !strncmp(a->argv[i], "-natnet", 7))
+        {
+            unsigned n = parseNum(&a->argv[i][7 + (a->argv[i][1] == '-')], NetworkAdapterCount, "NIC");
             if (!n)
                 return 1;
@@ -509,7 +550,8 @@
             i++;
         }
-        else if (strncmp(a->argv[i], "-macaddress", 11) == 0)
-        {
-            unsigned n = parseNum(&a->argv[i][11], NetworkAdapterCount, "NIC");
+        else if (   !strncmp(a->argv[i], "--macaddress", 12)
+                 || !strncmp(a->argv[i], "-macaddress", 11))
+        {
+            unsigned n = parseNum(&a->argv[i][11 + (a->argv[i][1] == '-')], NetworkAdapterCount, "NIC");
             if (!n)
                 return 1;
@@ -520,5 +562,6 @@
         }
 #ifdef VBOX_WITH_VRDP
-        else if (strcmp(a->argv[i], "-vrdp") == 0)
+        else if (   !strcmp(a->argv[i], "--vrdp")
+                 || !strcmp(a->argv[i], "-vrdp"))
         {
             if (a->argc <= i + 1)
@@ -527,15 +570,17 @@
             vrdp = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-vrdpport") == 0)
-        {
-            if (a->argc <= i + 1)
-                return errorArgument("Missing argument to '%s'", a->argv[i]);
-            i++;
-            if (strcmp(a->argv[i], "default") == 0)
+        else if (   !strcmp(a->argv[i], "--vrdpport")
+                 || !strcmp(a->argv[i], "-vrdpport"))
+        {
+            if (a->argc <= i + 1)
+                return errorArgument("Missing argument to '%s'", a->argv[i]);
+            i++;
+            if (!strcmp(a->argv[i], "default"))
                 vrdpport = 0;
             else
                 vrdpport = RTStrToUInt16(a->argv[i]);
         }
-        else if (strcmp(a->argv[i], "-vrdpaddress") == 0)
+        else if (   !strcmp(a->argv[i], "--vrdpaddress")
+                 || !strcmp(a->argv[i], "-vrdpaddress"))
         {
             if (a->argc <= i + 1)
@@ -544,5 +589,6 @@
             vrdpaddress = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-vrdpauthtype") == 0)
+        else if (   !strcmp(a->argv[i], "--vrdpauthtype")
+                 || !strcmp(a->argv[i], "-vrdpauthtype"))
         {
             if (a->argc <= i + 1)
@@ -551,5 +597,6 @@
             vrdpauthtype = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-vrdpmulticon") == 0)
+        else if (   !strcmp(a->argv[i], "--vrdpmulticon")
+                 || !strcmp(a->argv[i], "-vrdpmulticon"))
         {
             if (a->argc <= i + 1)
@@ -558,5 +605,6 @@
             vrdpmulticon = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-vrdpreusecon") == 0)
+        else if (   !strcmp(a->argv[i], "--vrdpreusecon")
+                 || !strcmp(a->argv[i], "-vrdpreusecon"))
         {
             if (a->argc <= i + 1)
@@ -566,29 +614,32 @@
         }
 #endif /* VBOX_WITH_VRDP */
-        else if (strcmp(a->argv[i], "-usb") == 0)
-        {
-            if (a->argc <= i + 1)
-                return errorArgument("Missing argument to '%s'", a->argv[i]);
-            i++;
-            if (strcmp(a->argv[i], "on") == 0 || strcmp(a->argv[i], "enable") == 0)
+        else if (   !strcmp(a->argv[i], "--usb")
+                 || !strcmp(a->argv[i], "-usb"))
+        {
+            if (a->argc <= i + 1)
+                return errorArgument("Missing argument to '%s'", a->argv[i]);
+            i++;
+            if (!strcmp(a->argv[i], "on") || !strcmp(a->argv[i], "enable"))
                 fUsbEnabled = 1;
-            else if (strcmp(a->argv[i], "off") == 0 || strcmp(a->argv[i], "disable") == 0)
+            else if (!strcmp(a->argv[i], "off") || !strcmp(a->argv[i], "disable"))
                 fUsbEnabled = 0;
             else
-                return errorArgument("Invalid -usb argument '%s'", a->argv[i]);
-        }
-        else if (strcmp(a->argv[i], "-usbehci") == 0)
-        {
-            if (a->argc <= i + 1)
-                return errorArgument("Missing argument to '%s'", a->argv[i]);
-            i++;
-            if (strcmp(a->argv[i], "on") == 0 || strcmp(a->argv[i], "enable") == 0)
+                return errorArgument("Invalid --usb argument '%s'", a->argv[i]);
+        }
+        else if (   !strcmp(a->argv[i], "--usbehci")
+                 || !strcmp(a->argv[i], "-usbehci"))
+        {
+            if (a->argc <= i + 1)
+                return errorArgument("Missing argument to '%s'", a->argv[i]);
+            i++;
+            if (!strcmp(a->argv[i], "on") || !strcmp(a->argv[i], "enable"))
                 fUsbEhciEnabled = 1;
-            else if (strcmp(a->argv[i], "off") == 0 || strcmp(a->argv[i], "disable") == 0)
+            else if (!strcmp(a->argv[i], "off") || !strcmp(a->argv[i], "disable"))
                 fUsbEhciEnabled = 0;
             else
-                return errorArgument("Invalid -usbehci argument '%s'", a->argv[i]);
-        }
-        else if (strcmp(a->argv[i], "-snapshotfolder") == 0)
+                return errorArgument("Invalid --usbehci argument '%s'", a->argv[i]);
+        }
+        else if (   !strcmp(a->argv[i], "--snapshotfolder")
+                 || !strcmp(a->argv[i], "-snapshotfolder"))
         {
             if (a->argc <= i + 1)
@@ -597,11 +648,12 @@
             snapshotFolder = a->argv[i];
         }
-        else if (strncmp(a->argv[i], "-uartmode", 9) == 0)
-        {
-            unsigned n = parseNum(&a->argv[i][9], SerialPortCount, "UART");
+        else if (   !strncmp(a->argv[i], "--uartmode", 10)
+                 || !strncmp(a->argv[i], "-uartmode", 9))
+        {
+            unsigned n = parseNum(&a->argv[i][9 + (a->argv[i][1] == '-')], SerialPortCount, "UART");
             if (!n)
                 return 1;
             i++;
-            if (strcmp(a->argv[i], "disconnected") == 0)
+            if (!strcmp(a->argv[i], "disconnected"))
             {
                 uarts_mode[n - 1] = a->argv[i];
@@ -609,10 +661,10 @@
             else
             {
-                if (strcmp(a->argv[i], "server") == 0 || strcmp(a->argv[i], "client") == 0)
+                if (!strcmp(a->argv[i], "server") || !strcmp(a->argv[i], "client"))
                 {
                     uarts_mode[n - 1] = a->argv[i];
                     i++;
 #ifdef RT_OS_WINDOWS
-                    if (strncmp(a->argv[i], "\\\\.\\pipe\\", 9))
+                    if (!strncmp(a->argv[i], "\\\\.\\pipe\\", 9))
                         return errorArgument("Uart pipe must start with \\\\.\\pipe\\");
 #endif
@@ -623,11 +675,12 @@
                 }
                 if (a->argc <= i)
-                    return errorArgument("Missing argument to -uartmode");
+                    return errorArgument("Missing argument to --uartmode");
                 uarts_path[n - 1] = a->argv[i];
             }
         }
-        else if (strncmp(a->argv[i], "-uart", 5) == 0)
-        {
-            unsigned n = parseNum(&a->argv[i][5], SerialPortCount, "UART");
+        else if (   !strncmp(a->argv[i], "--uart", 6)
+                 || !strncmp(a->argv[i], "-uart", 5))
+        {
+            unsigned n = parseNum(&a->argv[i][5 + (a->argv[i][1] == '-')], SerialPortCount, "UART");
             if (!n)
                 return 1;
@@ -635,5 +688,5 @@
                 return errorArgument("Missing argument to '%s'", a->argv[i]);
             i++;
-            if (strcmp(a->argv[i], "off") == 0 || strcmp(a->argv[i], "disable") == 0)
+            if (!strcmp(a->argv[i], "off") || !strcmp(a->argv[i], "disable"))
             {
                 uarts_base[n - 1] = (ULONG)-1;
@@ -657,5 +710,6 @@
         }
 #ifdef VBOX_WITH_MEM_BALLOONING
-        else if (strncmp(a->argv[i], "-guestmemoryballoon", 19) == 0)
+        else if (   !strcmp(a->argv[i], "--guestmemoryballoon")
+                 || !strcmp(a->argv[i], "-guestmemoryballoon"))
         {
             if (a->argc <= i + 1)
@@ -670,5 +724,6 @@
         }
 #endif
-        else if (strncmp(a->argv[i], "-gueststatisticsinterval", 24) == 0)
+        else if (   !strcmp(a->argv[i], "--gueststatisticsinterval")
+                 || !strcmp(a->argv[i], "-gueststatisticsinterval"))
         {
             if (a->argc <= i + 1)
@@ -682,17 +737,19 @@
             guestStatInterval = uVal;
         }
-        else if (strcmp(a->argv[i], "-sata") == 0)
-        {
-            if (a->argc <= i + 1)
-                return errorArgument("Missing argument to '%s'", a->argv[i]);
-            i++;
-            if (strcmp(a->argv[i], "on") == 0 || strcmp(a->argv[i], "enable") == 0)
+        else if (   !strcmp(a->argv[i], "--sata")
+                 || !strcmp(a->argv[i], "-sata"))
+        {
+            if (a->argc <= i + 1)
+                return errorArgument("Missing argument to '%s'", a->argv[i]);
+            i++;
+            if (!strcmp(a->argv[i], "on") || !strcmp(a->argv[i], "enable"))
                 fSataEnabled = 1;
-            else if (strcmp(a->argv[i], "off") == 0 || strcmp(a->argv[i], "disable") == 0)
+            else if (!strcmp(a->argv[i], "off") || !strcmp(a->argv[i], "disable"))
                 fSataEnabled = 0;
             else
-                return errorArgument("Invalid -usb argument '%s'", a->argv[i]);
-        }
-        else if (strcmp(a->argv[i], "-sataportcount") == 0)
+                return errorArgument("Invalid --usb argument '%s'", a->argv[i]);
+        }
+        else if (   !strcmp(a->argv[i], "--sataportcount")
+                 || !strcmp(a->argv[i], "-sataportcount"))
         {
             unsigned n;
@@ -707,7 +764,8 @@
             sataPortCount = n;
         }
-        else if (strncmp(a->argv[i], "-sataport", 9) == 0)
-        {
-            unsigned n = parseNum(&a->argv[i][9], 30, "SATA");
+        else if (   !strncmp(a->argv[i], "--sataport", 10)
+                 || !strncmp(a->argv[i], "-sataport", 9))
+        {
+            unsigned n = parseNum(&a->argv[i][9 + (a->argv[i][1] == '-')], 30, "SATA");
             if (!n)
                 return 1;
@@ -717,10 +775,11 @@
             hdds[n-1+4] = a->argv[i];
         }
-        else if (strncmp(a->argv[i], "-sataideemulation", 17) == 0)
+        else if (   !strncmp(a->argv[i], "--sataideemulation", 18)
+                 || !strncmp(a->argv[i], "-sataideemulation", 17))
         {
             unsigned bootDevicePos = 0;
             unsigned n;
 
-            bootDevicePos = parseNum(&a->argv[i][17], 4, "SATA");
+            bootDevicePos = parseNum(&a->argv[i][17 + (a->argv[i][1] == '-')], 4, "SATA");
             if (!bootDevicePos)
                 return 1;
@@ -737,19 +796,21 @@
             sataBootDevices[bootDevicePos] = n-1;
         }
-        else if (strcmp(a->argv[i], "-scsi") == 0)
-        {
-            if (a->argc <= i + 1)
-                return errorArgument("Missing argument to '%s'", a->argv[i]);
-            i++;
-            if (strcmp(a->argv[i], "on") == 0 || strcmp(a->argv[i], "enable") == 0)
+        else if (   !strcmp(a->argv[i], "--scsi")
+                 || !strcmp(a->argv[i], "-scsi"))
+        {
+            if (a->argc <= i + 1)
+                return errorArgument("Missing argument to '%s'", a->argv[i]);
+            i++;
+            if (!strcmp(a->argv[i], "on") || !strcmp(a->argv[i], "enable"))
                 fScsiEnabled = 1;
-            else if (strcmp(a->argv[i], "off") == 0 || strcmp(a->argv[i], "disable") == 0)
+            else if (!strcmp(a->argv[i], "off") || !strcmp(a->argv[i], "disable"))
                 fScsiEnabled = 0;
             else
-                return errorArgument("Invalid -scsi argument '%s'", a->argv[i]);
-        }
-        else if (strncmp(a->argv[i], "-scsiport", 9) == 0)
-        {
-            unsigned n = parseNum(&a->argv[i][9], 16, "SCSI");
+                return errorArgument("Invalid --scsi argument '%s'", a->argv[i]);
+        }
+        else if (   !strncmp(a->argv[i], "--scsiport", 10)
+                 || !strncmp(a->argv[i], "-scsiport", 9))
+        {
+            unsigned n = parseNum(&a->argv[i][9 + (a->argv[i][1] == '-')], 16, "SCSI");
             if (!n)
                 return 1;
@@ -759,15 +820,16 @@
             hdds[n-1+34] = a->argv[i];
         }
-        else if (strcmp(a->argv[i], "-scsitype") == 0)
-        {
-            if (a->argc <= i + 1)
-                return errorArgument("Missing argument to '%s'", a->argv[i]);
-            i++;
-            if (strcmp(a->argv[i], "LsiLogic") == 0 )
+        else if (   !strcmp(a->argv[i], "--scsitype")
+                 || !strcmp(a->argv[i], "-scsitype"))
+        {
+            if (a->argc <= i + 1)
+                return errorArgument("Missing argument to '%s'", a->argv[i]);
+            i++;
+            if (!RTStrICmp(a->argv[i], "LsiLogic"))
                 fScsiLsiLogic = 1;
-            else if (strcmp(a->argv[i], "BusLogic") == 0)
+            else if (!RTStrICmp(a->argv[i], "BusLogic"))
                 fScsiLsiLogic = 0;
             else
-                return errorArgument("Invalid -scsitype argument '%s'", a->argv[i]);
+                return errorArgument("Invalid --scsitype argument '%s'", a->argv[i]);
         }
         else
@@ -825,9 +887,9 @@
         if (acpi)
         {
-            if (strcmp(acpi, "on") == 0)
+            if (!strcmp(acpi, "on"))
             {
                 CHECK_ERROR(biosSettings, COMSETTER(ACPIEnabled)(true));
             }
-            else if (strcmp(acpi, "off") == 0)
+            else if (!strcmp(acpi, "off"))
             {
                 CHECK_ERROR(biosSettings, COMSETTER(ACPIEnabled)(false));
@@ -835,5 +897,5 @@
             else
             {
-                errorArgument("Invalid -acpi argument '%s'", acpi);
+                errorArgument("Invalid --acpi argument '%s'", acpi);
                 rc = E_FAIL;
                 break;
@@ -842,9 +904,9 @@
         if (ioapic)
         {
-            if (strcmp(ioapic, "on") == 0)
+            if (!strcmp(ioapic, "on"))
             {
                 CHECK_ERROR(biosSettings, COMSETTER(IOAPICEnabled)(true));
             }
-            else if (strcmp(ioapic, "off") == 0)
+            else if (!strcmp(ioapic, "off"))
             {
                 CHECK_ERROR(biosSettings, COMSETTER(IOAPICEnabled)(false));
@@ -852,5 +914,5 @@
             else
             {
-                errorArgument("Invalid -ioapic argument '%s'", ioapic);
+                errorArgument("Invalid --ioapic argument '%s'", ioapic);
                 rc = E_FAIL;
                 break;
@@ -859,13 +921,13 @@
         if (hwvirtex)
         {
-            if (strcmp(hwvirtex, "on") == 0)
+            if (!strcmp(hwvirtex, "on"))
             {
                 CHECK_ERROR(machine, COMSETTER(HWVirtExEnabled)(TSBool_True));
             }
-            else if (strcmp(hwvirtex, "off") == 0)
+            else if (!strcmp(hwvirtex, "off"))
             {
                 CHECK_ERROR(machine, COMSETTER(HWVirtExEnabled)(TSBool_False));
             }
-            else if (strcmp(hwvirtex, "default") == 0)
+            else if (!strcmp(hwvirtex, "default"))
             {
                 CHECK_ERROR(machine, COMSETTER(HWVirtExEnabled)(TSBool_Default));
@@ -873,5 +935,5 @@
             else
             {
-                errorArgument("Invalid -hwvirtex argument '%s'", hwvirtex);
+                errorArgument("Invalid --hwvirtex argument '%s'", hwvirtex);
                 rc = E_FAIL;
                 break;
@@ -880,9 +942,9 @@
         if (nestedpaging)
         {
-            if (strcmp(nestedpaging, "on") == 0)
+            if (!strcmp(nestedpaging, "on"))
             {
                 CHECK_ERROR(machine, COMSETTER(HWVirtExNestedPagingEnabled)(true));
             }
-            else if (strcmp(nestedpaging, "off") == 0)
+            else if (!strcmp(nestedpaging, "off"))
             {
                 CHECK_ERROR(machine, COMSETTER(HWVirtExNestedPagingEnabled)(false));
@@ -890,5 +952,5 @@
             else
             {
-                errorArgument("Invalid -nestedpaging argument '%s'", ioapic);
+                errorArgument("Invalid --nestedpaging argument '%s'", ioapic);
                 rc = E_FAIL;
                 break;
@@ -897,9 +959,9 @@
         if (vtxvpid)
         {
-            if (strcmp(vtxvpid, "on") == 0)
+            if (!strcmp(vtxvpid, "on"))
             {
                 CHECK_ERROR(machine, COMSETTER(HWVirtExVPIDEnabled)(true));
             }
-            else if (strcmp(vtxvpid, "off") == 0)
+            else if (!strcmp(vtxvpid, "off"))
             {
                 CHECK_ERROR(machine, COMSETTER(HWVirtExVPIDEnabled)(false));
@@ -907,5 +969,5 @@
             else
             {
-                errorArgument("Invalid -vtxvpid argument '%s'", ioapic);
+                errorArgument("Invalid --vtxvpid argument '%s'", ioapic);
                 rc = E_FAIL;
                 break;
@@ -914,9 +976,9 @@
         if (pae)
         {
-            if (strcmp(pae, "on") == 0)
+            if (!strcmp(pae, "on"))
             {
                 CHECK_ERROR(machine, COMSETTER(PAEEnabled)(true));
             }
-            else if (strcmp(pae, "off") == 0)
+            else if (!strcmp(pae, "off"))
             {
                 CHECK_ERROR(machine, COMSETTER(PAEEnabled)(false));
@@ -924,5 +986,5 @@
             else
             {
-                errorArgument("Invalid -pae argument '%s'", ioapic);
+                errorArgument("Invalid --pae argument '%s'", ioapic);
                 rc = E_FAIL;
                 break;
@@ -935,9 +997,9 @@
         if (accelerate3d)
         {
-            if (strcmp(accelerate3d, "on") == 0)
+            if (!strcmp(accelerate3d, "on"))
             {
                 CHECK_ERROR(machine, COMSETTER(Accelerate3DEnabled)(true));
             }
-            else if (strcmp(accelerate3d, "off") == 0)
+            else if (!strcmp(accelerate3d, "off"))
             {
                 CHECK_ERROR(machine, COMSETTER(Accelerate3DEnabled)(false));
@@ -945,5 +1007,5 @@
             else
             {
-                errorArgument("Invalid -accelerate3d argument '%s'", ioapic);
+                errorArgument("Invalid --accelerate3d argument '%s'", ioapic);
                 rc = E_FAIL;
                 break;
@@ -952,9 +1014,9 @@
         if (bioslogofadein)
         {
-            if (strcmp(bioslogofadein, "on") == 0)
+            if (!strcmp(bioslogofadein, "on"))
             {
                 CHECK_ERROR(biosSettings, COMSETTER(LogoFadeIn)(true));
             }
-            else if (strcmp(bioslogofadein, "off") == 0)
+            else if (!strcmp(bioslogofadein, "off"))
             {
                 CHECK_ERROR(biosSettings, COMSETTER(LogoFadeIn)(false));
@@ -962,5 +1024,5 @@
             else
             {
-                errorArgument("Invalid -bioslogofadein argument '%s'", bioslogofadein);
+                errorArgument("Invalid --bioslogofadein argument '%s'", bioslogofadein);
                 rc = E_FAIL;
                 break;
@@ -969,9 +1031,9 @@
         if (bioslogofadeout)
         {
-            if (strcmp(bioslogofadeout, "on") == 0)
+            if (!strcmp(bioslogofadeout, "on"))
             {
                 CHECK_ERROR(biosSettings, COMSETTER(LogoFadeOut)(true));
             }
-            else if (strcmp(bioslogofadeout, "off") == 0)
+            else if (!strcmp(bioslogofadeout, "off"))
             {
                 CHECK_ERROR(biosSettings, COMSETTER(LogoFadeOut)(false));
@@ -979,5 +1041,5 @@
             else
             {
-                errorArgument("Invalid -bioslogofadeout argument '%s'", bioslogofadeout);
+                errorArgument("Invalid --bioslogofadeout argument '%s'", bioslogofadeout);
                 rc = E_FAIL;
                 break;
@@ -994,13 +1056,13 @@
         if (biosbootmenumode)
         {
-            if (strcmp(biosbootmenumode, "disabled") == 0)
+            if (!strcmp(biosbootmenumode, "disabled"))
                 CHECK_ERROR(biosSettings, COMSETTER(BootMenuMode)(BIOSBootMenuMode_Disabled));
-            else if (strcmp(biosbootmenumode, "menuonly") == 0)
+            else if (!strcmp(biosbootmenumode, "menuonly"))
                 CHECK_ERROR(biosSettings, COMSETTER(BootMenuMode)(BIOSBootMenuMode_MenuOnly));
-            else if (strcmp(biosbootmenumode, "messageandmenu") == 0)
+            else if (!strcmp(biosbootmenumode, "messageandmenu"))
                 CHECK_ERROR(biosSettings, COMSETTER(BootMenuMode)(BIOSBootMenuMode_MessageAndMenu));
             else
             {
-                errorArgument("Invalid -biosbootmenu argument '%s'", biosbootmenumode);
+                errorArgument("Invalid --biosbootmenu argument '%s'", biosbootmenumode);
                 rc = E_FAIL;
                 break;
@@ -1015,9 +1077,9 @@
         if (biospxedebug)
         {
-            if (strcmp(biospxedebug, "on") == 0)
+            if (!strcmp(biospxedebug, "on"))
             {
                 CHECK_ERROR(biosSettings, COMSETTER(PXEDebugEnabled)(true));
             }
-            else if (strcmp(biospxedebug, "off") == 0)
+            else if (!strcmp(biospxedebug, "off"))
             {
                 CHECK_ERROR(biosSettings, COMSETTER(PXEDebugEnabled)(false));
@@ -1025,5 +1087,5 @@
             else
             {
-                errorArgument("Invalid -biospxedebug argument '%s'", biospxedebug);
+                errorArgument("Invalid --biospxedebug argument '%s'", biospxedebug);
                 rc = E_FAIL;
                 break;
@@ -1037,5 +1099,5 @@
         if (hdds[0])
         {
-            if (strcmp(hdds[0], "none") == 0)
+            if (!strcmp(hdds[0], "none"))
             {
                 machine->DetachHardDisk(Bstr("IDE"), 0, 0);
@@ -1070,5 +1132,5 @@
         if (hdds[1])
         {
-            if (strcmp(hdds[1], "none") == 0)
+            if (!strcmp(hdds[1], "none"))
             {
                 machine->DetachHardDisk(Bstr("IDE"), 0, 1);
@@ -1103,5 +1165,5 @@
         if (hdds[2])
         {
-            if (strcmp(hdds[2], "none") == 0)
+            if (!strcmp(hdds[2], "none"))
             {
                 machine->DetachHardDisk(Bstr("IDE"), 1, 1);
@@ -1141,10 +1203,10 @@
 
             /* unmount? */
-            if (strcmp(dvd, "none") == 0)
+            if (!strcmp(dvd, "none"))
             {
                 CHECK_ERROR(dvdDrive, Unmount());
             }
             /* host drive? */
-            else if (strncmp(dvd, "host:", 5) == 0)
+            else if (!strncmp(dvd, "host:", 5))
             {
                 ComPtr<IHost> host;
@@ -1208,5 +1270,5 @@
             ASSERT(dvdDrive);
 
-            CHECK_ERROR(dvdDrive, COMSETTER(Passthrough)(strcmp(dvdpassthrough, "on") == 0));
+            CHECK_ERROR(dvdDrive, COMSETTER(Passthrough)(!strcmp(dvdpassthrough, "on")));
         }
         if (idecontroller)
@@ -1215,13 +1277,13 @@
             CHECK_ERROR(machine, GetStorageControllerByName(Bstr("IDE"), storageController.asOutParam()));
 
-            if (RTStrICmp(idecontroller, "PIIX3") == 0)
+            if (RTStrICmp(idecontroller, "PIIX3"))
             {
                 CHECK_ERROR(storageController, COMSETTER(ControllerType)(StorageControllerType_PIIX3));
             }
-            else if (RTStrICmp(idecontroller, "PIIX4") == 0)
+            else if (RTStrICmp(idecontroller, "PIIX4"))
             {
                 CHECK_ERROR(storageController, COMSETTER(ControllerType)(StorageControllerType_PIIX4));
             }
-            else if (RTStrICmp(idecontroller, "ICH6") == 0)
+            else if (RTStrICmp(idecontroller, "ICH6"))
             {
                 CHECK_ERROR(storageController, COMSETTER(ControllerType)(StorageControllerType_ICH6));
@@ -1229,5 +1291,5 @@
             else
             {
-                errorArgument("Invalid -idecontroller argument '%s'", idecontroller);
+                errorArgument("Invalid --idecontroller argument '%s'", idecontroller);
                 rc = E_FAIL;
                 break;
@@ -1241,5 +1303,5 @@
 
             /* disable? */
-            if (strcmp(floppy, "disabled") == 0)
+            if (!strcmp(floppy, "disabled"))
             {
                 /* disable the controller */
@@ -1252,10 +1314,10 @@
 
                 /* unmount? */
-                if (strcmp(floppy, "empty") == 0)
+                if (!strcmp(floppy, "empty"))
                 {
                     CHECK_ERROR(floppyDrive, Unmount());
                 }
                 /* host drive? */
-                else if (strncmp(floppy, "host:", 5) == 0)
+                else if (!strncmp(floppy, "host:", 5))
                 {
                     ComPtr<IHost> host;
@@ -1310,9 +1372,9 @@
             {
                 /* disable? */
-                if (strcmp(audio, "none") == 0)
+                if (!strcmp(audio, "none"))
                 {
                     CHECK_ERROR(audioAdapter, COMSETTER(Enabled)(false));
                 }
-                else if (strcmp(audio, "null") == 0)
+                else if (!strcmp(audio, "null"))
                 {
                     CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_Null));
@@ -1321,5 +1383,5 @@
 #ifdef RT_OS_WINDOWS
 #ifdef VBOX_WITH_WINMM
-                else if (strcmp(audio, "winmm") == 0)
+                else if (!strcmp(audio, "winmm"))
                 {
                     CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_WinMM));
@@ -1327,5 +1389,5 @@
                 }
 #endif
-                else if (strcmp(audio, "dsound") == 0)
+                else if (!strcmp(audio, "dsound"))
                 {
                     CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_DirectSound));
@@ -1334,5 +1396,5 @@
 #endif /* RT_OS_WINDOWS */
 #ifdef RT_OS_LINUX
-                else if (strcmp(audio, "oss") == 0)
+                else if (!strcmp(audio, "oss"))
                 {
                     CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_OSS));
@@ -1340,5 +1402,5 @@
                 }
 # ifdef VBOX_WITH_ALSA
-                else if (strcmp(audio, "alsa") == 0)
+                else if (!strcmp(audio, "alsa"))
                 {
                     CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_ALSA));
@@ -1347,5 +1409,5 @@
 # endif
 # ifdef VBOX_WITH_PULSE
-                else if (strcmp(audio, "pulse") == 0)
+                else if (!strcmp(audio, "pulse"))
                 {
                     CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_Pulse));
@@ -1355,5 +1417,5 @@
 #endif /* !RT_OS_LINUX */
 #ifdef RT_OS_SOLARIS
-                else if (strcmp(audio, "solaudio") == 0)
+                else if (!strcmp(audio, "solaudio"))
                 {
                     CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_SolAudio));
@@ -1363,5 +1425,5 @@
 #endif /* !RT_OS_SOLARIS */
 #ifdef RT_OS_DARWIN
-                else if (strcmp(audio, "coreaudio") == 0)
+                else if (!strcmp(audio, "coreaudio"))
                 {
                     CHECK_ERROR(audioAdapter, COMSETTER(AudioDriver)(AudioDriverType_CoreAudio));
@@ -1372,5 +1434,5 @@
                 else
                 {
-                    errorArgument("Invalid -audio argument '%s'", audio);
+                    errorArgument("Invalid --audio argument '%s'", audio);
                     rc = E_FAIL;
                     break;
@@ -1379,11 +1441,11 @@
             if (audiocontroller)
             {
-                if (strcmp(audiocontroller, "sb16") == 0)
+                if (!strcmp(audiocontroller, "sb16"))
                     CHECK_ERROR(audioAdapter, COMSETTER(AudioController)(AudioControllerType_SB16));
-                else if (strcmp(audiocontroller, "ac97") == 0)
+                else if (!strcmp(audiocontroller, "ac97"))
                     CHECK_ERROR(audioAdapter, COMSETTER(AudioController)(AudioControllerType_AC97));
                 else
                 {
-                    errorArgument("Invalid -audiocontroller argument '%s'", audiocontroller);
+                    errorArgument("Invalid --audiocontroller argument '%s'", audiocontroller);
                     rc = E_FAIL;
                     break;
@@ -1398,17 +1460,17 @@
             ASSERT(clipboardMode);
 */
-            if (strcmp(clipboard, "disabled") == 0)
+            if (!strcmp(clipboard, "disabled"))
             {
                 CHECK_ERROR(machine, COMSETTER(ClipboardMode)(ClipboardMode_Disabled));
             }
-            else if (strcmp(clipboard, "hosttoguest") == 0)
+            else if (!strcmp(clipboard, "hosttoguest"))
             {
                 CHECK_ERROR(machine, COMSETTER(ClipboardMode)(ClipboardMode_HostToGuest));
             }
-            else if (strcmp(clipboard, "guesttohost") == 0)
+            else if (!strcmp(clipboard, "guesttohost"))
             {
                 CHECK_ERROR(machine, COMSETTER(ClipboardMode)(ClipboardMode_GuestToHost));
             }
-            else if (strcmp(clipboard, "bidirectional") == 0)
+            else if (!strcmp(clipboard, "bidirectional"))
             {
                 CHECK_ERROR(machine, COMSETTER(ClipboardMode)(ClipboardMode_Bidirectional));
@@ -1416,5 +1478,5 @@
             else
             {
-                errorArgument("Invalid -clipboard argument '%s'", clipboard);
+                errorArgument("Invalid --clipboard argument '%s'", clipboard);
                 rc = E_FAIL;
                 break;
@@ -1432,25 +1494,25 @@
             if (nics[n])
             {
-                if (strcmp(nics[n], "none") == 0)
+                if (!strcmp(nics[n], "none"))
                 {
                     CHECK_ERROR_RET(nic, COMSETTER(Enabled) (FALSE), 1);
                 }
-                else if (strcmp(nics[n], "null") == 0)
+                else if (!strcmp(nics[n], "null"))
                 {
                     CHECK_ERROR_RET(nic, COMSETTER(Enabled) (TRUE), 1);
                     CHECK_ERROR_RET(nic, Detach(), 1);
                 }
-                else if (strcmp(nics[n], "nat") == 0)
+                else if (!strcmp(nics[n], "nat"))
                 {
                     CHECK_ERROR_RET(nic, COMSETTER(Enabled) (TRUE), 1);
                     CHECK_ERROR_RET(nic, AttachToNAT(), 1);
                 }
-                else if (  strcmp(nics[n], "bridged") == 0
-                        || strcmp(nics[n], "hostif") == 0) /* backward compatibility */
+                else if (  !strcmp(nics[n], "bridged")
+                        || !strcmp(nics[n], "hostif")) /* backward compatibility */
                 {
                     CHECK_ERROR_RET(nic, COMSETTER(Enabled) (TRUE), 1);
                     CHECK_ERROR_RET(nic, AttachToBridgedInterface(), 1);
                 }
-                else if (strcmp(nics[n], "intnet") == 0)
+                else if (!strcmp(nics[n], "intnet"))
                 {
                     CHECK_ERROR_RET(nic, COMSETTER(Enabled) (TRUE), 1);
@@ -1458,5 +1520,5 @@
                 }
 #if defined(VBOX_WITH_NETFLT)
-                else if (strcmp(nics[n], "hostonly") == 0)
+                else if (!strcmp(nics[n], "hostonly"))
                 {
 
@@ -1476,22 +1538,22 @@
             if (nictype[n])
             {
-                if (strcmp(nictype[n], "Am79C970A") == 0)
+                if (!strcmp(nictype[n], "Am79C970A"))
                 {
                     CHECK_ERROR_RET(nic, COMSETTER(AdapterType)(NetworkAdapterType_Am79C970A), 1);
                 }
-                else if (strcmp(nictype[n], "Am79C973") == 0)
+                else if (!strcmp(nictype[n], "Am79C973"))
                 {
                     CHECK_ERROR_RET(nic, COMSETTER(AdapterType)(NetworkAdapterType_Am79C973), 1);
                 }
 #ifdef VBOX_WITH_E1000
-                else if (strcmp(nictype[n], "82540EM") == 0)
+                else if (!strcmp(nictype[n], "82540EM"))
                 {
                     CHECK_ERROR_RET(nic, COMSETTER(AdapterType)(NetworkAdapterType_I82540EM), 1);
                 }
-                else if (strcmp(nictype[n], "82543GC") == 0)
+                else if (!strcmp(nictype[n], "82543GC"))
                 {
                     CHECK_ERROR_RET(nic, COMSETTER(AdapterType)(NetworkAdapterType_I82543GC), 1);
                 }
-                else if (strcmp(nictype[n], "82545EM") == 0)
+                else if (!strcmp(nictype[n], "82545EM"))
                 {
                     CHECK_ERROR_RET(nic, COMSETTER(AdapterType)(NetworkAdapterType_I82545EM), 1);
@@ -1510,5 +1572,5 @@
             {
                 /* generate one? */
-                if (strcmp(macs[n], "auto") == 0)
+                if (!strcmp(macs[n], "auto"))
                 {
                     CHECK_ERROR_RET(nic, COMSETTER(MACAddress)(NULL), 1);
@@ -1529,5 +1591,5 @@
                 if (u32LineSpeed < 1000 || u32LineSpeed > 4000000)
                 {
-                    errorArgument("Invalid -nicspeed%lu argument '%s'", n + 1, nicspeed[n]);
+                    errorArgument("Invalid --nicspeed%lu argument '%s'", n + 1, nicspeed[n]);
                     rc = E_FAIL;
                     break;
@@ -1539,9 +1601,9 @@
             if (cableconnected[n])
             {
-                if (strcmp(cableconnected[n], "on") == 0)
+                if (!strcmp(cableconnected[n], "on"))
                 {
                     CHECK_ERROR_RET(nic, COMSETTER(CableConnected)(TRUE), 1);
                 }
-                else if (strcmp(cableconnected[n], "off") == 0)
+                else if (!strcmp(cableconnected[n], "off"))
                 {
                     CHECK_ERROR_RET(nic, COMSETTER(CableConnected)(FALSE), 1);
@@ -1549,5 +1611,5 @@
                 else
                 {
-                    errorArgument("Invalid -cableconnected%lu argument '%s'", n + 1, cableconnected[n]);
+                    errorArgument("Invalid --cableconnected%lu argument '%s'", n + 1, cableconnected[n]);
                     rc = E_FAIL;
                     break;
@@ -1558,9 +1620,9 @@
             if (nictrace[n])
             {
-                if (strcmp(nictrace[n], "on") == 0)
+                if (!strcmp(nictrace[n], "on"))
                 {
                     CHECK_ERROR_RET(nic, COMSETTER(TraceEnabled)(TRUE), 1);
                 }
-                else if (strcmp(nictrace[n], "off") == 0)
+                else if (!strcmp(nictrace[n], "off"))
                 {
                     CHECK_ERROR_RET(nic, COMSETTER(TraceEnabled)(FALSE), 1);
@@ -1568,5 +1630,5 @@
                 else
                 {
-                    errorArgument("Invalid -nictrace%lu argument '%s'", n + 1, nictrace[n]);
+                    errorArgument("Invalid --nictrace%lu argument '%s'", n + 1, nictrace[n]);
                     rc = E_FAIL;
                     break;
@@ -1584,5 +1646,5 @@
             {
                 /* remove it? */
-                if (strcmp(hostifdev[n], "none") == 0)
+                if (!strcmp(hostifdev[n], "none"))
                 {
                     CHECK_ERROR_RET(nic, COMSETTER(HostInterface)(NULL), 1);
@@ -1598,5 +1660,5 @@
             {
                 /* remove it? */
-                if (strcmp(intnet[n], "none") == 0)
+                if (!strcmp(intnet[n], "none"))
                 {
                     CHECK_ERROR_RET(nic, COMSETTER(InternalNetwork)(NULL), 1);
@@ -1639,5 +1701,5 @@
             if (uarts_mode[n])
             {
-                if (strcmp(uarts_mode[n], "disconnected") == 0)
+                if (!strcmp(uarts_mode[n], "disconnected"))
                 {
                     CHECK_ERROR_RET(uart, COMSETTER(HostMode) (PortMode_Disconnected), 1);
@@ -1646,10 +1708,10 @@
                 {
                     CHECK_ERROR_RET(uart, COMSETTER(Path) (Bstr(uarts_path[n])), 1);
-                    if (strcmp(uarts_mode[n], "server") == 0)
+                    if (!strcmp(uarts_mode[n], "server"))
                     {
                         CHECK_ERROR_RET(uart, COMSETTER(HostMode) (PortMode_HostPipe), 1);
                         CHECK_ERROR_RET(uart, COMSETTER(Server) (TRUE), 1);
                     }
-                    else if (strcmp(uarts_mode[n], "client") == 0)
+                    else if (!strcmp(uarts_mode[n], "client"))
                     {
                         CHECK_ERROR_RET(uart, COMSETTER(HostMode) (PortMode_HostPipe), 1);
@@ -1676,9 +1738,9 @@
                 if (vrdp)
                 {
-                    if (strcmp(vrdp, "on") == 0)
+                    if (!strcmp(vrdp, "on"))
                     {
                         CHECK_ERROR(vrdpServer, COMSETTER(Enabled)(true));
                     }
-                    else if (strcmp(vrdp, "off") == 0)
+                    else if (!strcmp(vrdp, "off"))
                     {
                         CHECK_ERROR(vrdpServer, COMSETTER(Enabled)(false));
@@ -1686,5 +1748,5 @@
                     else
                     {
-                        errorArgument("Invalid -vrdp argument '%s'", vrdp);
+                        errorArgument("Invalid --vrdp argument '%s'", vrdp);
                         rc = E_FAIL;
                         break;
@@ -1701,13 +1763,13 @@
                 if (vrdpauthtype)
                 {
-                    if (strcmp(vrdpauthtype, "null") == 0)
+                    if (!strcmp(vrdpauthtype, "null"))
                     {
                         CHECK_ERROR(vrdpServer, COMSETTER(AuthType)(VRDPAuthType_Null));
                     }
-                    else if (strcmp(vrdpauthtype, "external") == 0)
+                    else if (!strcmp(vrdpauthtype, "external"))
                     {
                         CHECK_ERROR(vrdpServer, COMSETTER(AuthType)(VRDPAuthType_External));
                     }
-                    else if (strcmp(vrdpauthtype, "guest") == 0)
+                    else if (!strcmp(vrdpauthtype, "guest"))
                     {
                         CHECK_ERROR(vrdpServer, COMSETTER(AuthType)(VRDPAuthType_Guest));
@@ -1715,5 +1777,5 @@
                     else
                     {
-                        errorArgument("Invalid -vrdpauthtype argument '%s'", vrdpauthtype);
+                        errorArgument("Invalid --vrdpauthtype argument '%s'", vrdpauthtype);
                         rc = E_FAIL;
                         break;
@@ -1722,9 +1784,9 @@
                 if (vrdpmulticon)
                 {
-                    if (strcmp(vrdpmulticon, "on") == 0)
+                    if (!strcmp(vrdpmulticon, "on"))
                     {
                         CHECK_ERROR(vrdpServer, COMSETTER(AllowMultiConnection)(true));
                     }
-                    else if (strcmp(vrdpmulticon, "off") == 0)
+                    else if (!strcmp(vrdpmulticon, "off"))
                     {
                         CHECK_ERROR(vrdpServer, COMSETTER(AllowMultiConnection)(false));
@@ -1732,5 +1794,5 @@
                     else
                     {
-                        errorArgument("Invalid -vrdpmulticon argument '%s'", vrdpmulticon);
+                        errorArgument("Invalid --vrdpmulticon argument '%s'", vrdpmulticon);
                         rc = E_FAIL;
                         break;
@@ -1739,9 +1801,9 @@
                 if (vrdpreusecon)
                 {
-                    if (strcmp(vrdpreusecon, "on") == 0)
+                    if (!strcmp(vrdpreusecon, "on"))
                     {
                         CHECK_ERROR(vrdpServer, COMSETTER(ReuseSingleConnection)(true));
                     }
-                    else if (strcmp(vrdpreusecon, "off") == 0)
+                    else if (!strcmp(vrdpreusecon, "off"))
                     {
                         CHECK_ERROR(vrdpServer, COMSETTER(ReuseSingleConnection)(false));
@@ -1749,5 +1811,5 @@
                     else
                     {
-                        errorArgument("Invalid -vrdpreusecon argument '%s'", vrdpreusecon);
+                        errorArgument("Invalid --vrdpreusecon argument '%s'", vrdpreusecon);
                         rc = E_FAIL;
                         break;
@@ -1785,5 +1847,5 @@
         if (snapshotFolder)
         {
-            if (strcmp(snapshotFolder, "default") == 0)
+            if (!strcmp(snapshotFolder, "default"))
             {
                 CHECK_ERROR(machine, COMSETTER(SnapshotFolder)(NULL));
@@ -1820,5 +1882,5 @@
             if (hdds[i])
             {
-                if (strcmp(hdds[i], "none") == 0)
+                if (!strcmp(hdds[i], "none"))
                 {
                     machine->DetachHardDisk(Bstr("SATA"), i-4, 0);
@@ -1884,5 +1946,5 @@
             {
                 ComPtr<IStorageController> ctl;
-                if (fScsiLsiLogic == 0)
+                if (!fScsiLsiLogic)
                 {
                     CHECK_ERROR(machine, AddStorageController(Bstr("BusLogic"), StorageBus_SCSI, ctl.asOutParam()));
@@ -1907,5 +1969,5 @@
             if (hdds[i])
             {
-                if (strcmp(hdds[i], "none") == 0)
+                if (!strcmp(hdds[i], "none"))
                 {
                     rc = machine->DetachHardDisk(Bstr("LsiLogic"), i-34, 0);
