Address the problems

(It now assumes that BreakEvents are correctly triggered!)