Cleanup in dbg_stoppoint handling in CBE. Patch by Sandeep Patel.