collect cycles.

Also, some code updating and re-org to factor code into the base
class.

_dostore(): Support conflict resolution.