Minor code cleanup to snapshot protocol - nothing functional