Some debug info cleanups
One more race-free builtin
Replace large timeouts in a more general way
Unregister should happen together with exit
Better placement of an assertion
Indentation fixes