This short series removes a number of simpler cleanups from breakpoint.c. I split it in two because it seemed easier to review the second patch in isolation. Regression tested by the buildbot. Tom