More work.

This is super-experimental, in that there are a few race conditions I haven't yet tracked down, but I don't want to completely scrap this work.
...
Fixing a significant source of race conditions.