save via temp dir

Removing a few race conditions in preparation for adding collapsed
forwarding.