cleaning up the mechanics for custom saga storage.  Closes GH-93, Closes GH-94