Better factoring for composite snapshots