Whitespace, indentation
Simplify
Don't try be smarter than the guy who wrote this

A while ago I removed a hack which was preventing some assertions from
being swallowed and as a result, the testing suite has been broken for
a while. Fortunately, seems that no functionality (except for breakpoint
deletion which is how I discovered this) has been broken since. Reenable
the hack.
Fix the test suite after last commit
Don't know why this test is failing now...

The feature works fine, seems like a problem with the signaling in the
test. I'm skipping it until I investigate this further.
Prepare for 2.3.1 release