A bit more fool-proofing and more comments in snapshotting code.