Ooops, restore storing off the format or lots of strange stuff happens (and calls don't work)

Also fix up a few bugs that were hit when investigating having a null format.