Updated passes 6 and 8 for to the changtes in the cycle breaker API (changed signature of save callback).