diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 563d665a1c..9ecaaffb4c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-09  Markus Deuling  <deuling@de.ibm.com>
+
+	* infrun.c (breakpoints_failed): Remove unnecessary variable.
+	(handle_inferior_event): Remove unnecessary braces.
+	* breakpoint.c (bpstat_what): Remove wrong comment.
+
 2007-03-09  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* spu-tdep.c (spu_in_function_epilogue_p): New function.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index aebd95d83b..abefcdcb14 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -3134,8 +3134,6 @@ bpstat_what (bpstat bs)
   /* step_resume entries: a step resume breakpoint overrides another
      breakpoint of signal handling (see comment in wait_for_inferior
      at where we set the step_resume breakpoint).  */
-  /* We handle the through_sigtramp_breakpoint the same way; having both
-     one of those and a step_resume_breakpoint is probably very rare (?).  */
 
   static const enum bpstat_what_main_action
     table[(int) class_last][(int) BPSTAT_WHAT_LAST] =
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 5d03619930..0bea6a9a1f 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -288,10 +288,6 @@ int proceed_to_finish;
 
 struct regcache *stop_registers;
 
-/* Nonzero if program stopped due to error trying to insert breakpoints.  */
-
-static int breakpoints_failed;
-
 /* Nonzero after stop if current stack frame should be printed.  */
 
 static int stop_print_frame;
@@ -1830,7 +1826,6 @@ handle_inferior_event (struct execution_control_state *ecs)
   stop_print_frame = 1;
   ecs->random_signal = 0;
   stopped_by_random_signal = 0;
-  breakpoints_failed = 0;
 
   if (stop_signal == TARGET_SIGNAL_TRAP
       && trap_expected
@@ -2126,9 +2121,7 @@ process_event_stop_test:
         if (debug_infrun)
 	  fprintf_unfiltered (gdb_stdlog, "infrun: BPSTAT_WHAT_SINGLE\n");
 	if (breakpoints_inserted)
-	  {
-	    remove_breakpoints ();
-	  }
+	  remove_breakpoints ();
 	breakpoints_inserted = 0;
 	ecs->another_trap = 1;
 	/* Still need to check other stuff, at least the case
@@ -2909,8 +2902,9 @@ keep_going (struct execution_control_state *ecs)
 
       if (!breakpoints_inserted && !ecs->another_trap)
 	{
-	  breakpoints_failed = insert_breakpoints ();
-	  if (breakpoints_failed)
+	  /* Stop stepping when inserting breakpoints
+	     has failed.  */
+	  if (insert_breakpoints () != 0)
 	    {
 	      stop_stepping (ecs);
 	      return;