Refine autosave behavior

Resolves autosaving issues we were seeing in a production app.