Fix some bad race conditions with inserting hooks into the dispatch
system, but we're still up shit's creek w/r/t reference counts.  We have
cycles up the wazoo. Need to take a step back and think about it a
bit...