Extract last states when computing dsg
Add abstract counting to stores
More typing