Another improvement to breakpoint stuff