--- a/modules/libmar/tool/mar.c
+++ b/modules/libmar/tool/mar.c
@@ -151,31 +151,32 @@ int main(int argc, char **argv) {
   }
 
   if (argc < 3) {
     print_usage();
     return -1;
   }
 
   while (argc > 0) {
-    if (argv[1][0] == '-' && (argv[1][1] == 'c' || 
-        argv[1][1] == 't' || argv[1][1] == 'x' || 
+    if (argv[1][0] == '-' && (argv[1][1] == 'c' ||
+        argv[1][1] == 't' || argv[1][1] == 'x' ||
         argv[1][1] == 'v' || argv[1][1] == 's' ||
         argv[1][1] == 'i' || argv[1][1] == 'T' ||
         argv[1][1] == 'r' || argv[1][1] == 'X' ||
         argv[1][1] == 'I')) {
       break;
     /* -C workingdirectory */
-    } else if (argv[1][0] == '-' && argv[1][1] == 'C') {
+    }
+    if (argv[1][0] == '-' && argv[1][1] == 'C') {
       if (chdir(argv[2]) != 0) {
         return -1;
       }
       argv += 2;
       argc -= 2;
-    } 
+    }
 #if !defined(NO_SIGN_VERIFY) && ((!defined(MAR_NSS) && defined(XP_WIN)) || \
                                  defined(XP_MACOSX))
     /* -D DERFilePath, also matches -D[index] DERFilePath
        We allow an index for verifying to be symmetric
        with the import and export command line arguments. */
     else if (argv[1][0] == '-' &&
              argv[1][1] == 'D' &&
              (argv[1][2] == (char)('0' + certCount) || argv[1][2] == '\0')) {