Don't rely on a closure in cleanup hook.

It's unnecessary so just skip it.
Split off reaper code.