Big dumb refactor

This is the refactor part of the persistence work that i was working on.
Are you sure this is a good idea?  What if a test runs code that tries a SuperVerbose but is still correct code?