add Dump and Dumpf to Watchpoint, wider line numbers