CVS diff of pseudo-saved-state code