diff --git a/carg_parser.c b/carg_parser.c
index b4b6174..6850643 100644
--- a/carg_parser.c
+++ b/carg_parser.c
@@ -204,8 +204,6 @@ char ap_init( struct Arg_parser * const ap,
   int non_options_size = 0;		/* number of skipped non-options */
   int argind = 1;			/* index in argv */
   int i;
-  int Status = 0;
-  void * tmp = NULL;
 
   ap->data = 0;
   ap->error = 0;
@@ -225,15 +223,9 @@ char ap_init( struct Arg_parser * const ap,
       if( ch2 == '-' )
         {
         if( !argv[argind][2] ) { ++argind; break; }	/* we found "--" */
-        else if( !parse_long_option( ap, opt, arg, options, &argind ) ) {
-          Status = 0;
-          goto Exit;
-          }
+        else if( !parse_long_option( ap, opt, arg, options, &argind ) ) return 0;
         }
-      else if( !parse_short_option( ap, opt, arg, options, &argind ) ) {
-          Status = 0;
-          goto Exit;
-          }
+      else if( !parse_short_option( ap, opt, arg, options, &argind ) ) return 0;
       if( ap->error ) break;
       }
     else
@@ -242,7 +234,7 @@ char ap_init( struct Arg_parser * const ap,
         { if( !push_back_record( ap, 0, argv[argind++] ) ) return 0; }
       else
         {
-        tmp = ap_resize_buffer( non_options,
+        void * tmp = ap_resize_buffer( non_options,
                        ( non_options_size + 1 ) * sizeof *non_options );
         if( !tmp ) return 0;
         non_options = (const char **)tmp;
@@ -254,21 +246,12 @@ char ap_init( struct Arg_parser * const ap,
   else
     {
     for( i = 0; i < non_options_size; ++i )
-      if( !push_back_record( ap, 0, non_options[i] ) ) {
-        Status = 0;
-        goto Exit;
-      }
+      if( !push_back_record( ap, 0, non_options[i] ) ) return 0;
     while( argind < argc )
-      if( !push_back_record( ap, 0, argv[argind++] ) ) {
-        Status = 0;
-        goto Exit;
-      }
+      if( !push_back_record( ap, 0, argv[argind++] ) ) return 0;
     }
-  Status = 1;
-  goto Exit;
-Exit:
   if( non_options ) free( non_options );
-  return(Status);
+  return 1;
   }
 
 
diff --git a/main_loop.c b/main_loop.c
index efa5e23..bcf31a8 100644
--- a/main_loop.c
+++ b/main_loop.c
@@ -614,7 +614,7 @@ static int exec_command( const char ** const ibufpp, const int prev_status,
                    !print_lines( second_addr, second_addr, 0 ) )
                 return ERR;
               break;
-    case '#': while( *(*ibufpp)++ != '\n' ) {} ;
+    case '#': while( *(*ibufpp)++ != '\n' ) ;
               break;
     default : set_error_msg( "Unknown command" ); return ERR;
     }