Fixes for SSO state snapshotting

I've now successfully trimmed a trace with SSOs.  Still probably some bugs here but it's coming along.