Use [at]onExit.
Use the actual push callbacks.
Remove cruft.
Rename test.
Clarify FIXME.