Clearer delineation between in-memory and persisted state for catalog objects

[justinj]

As referenced in this comment, these currently overlap and it would be good to have the distinction be clearer.