Tidying up incremental snapshotspec