Redo watchpoint code so that it target can specify interrupt names.