Updated interfaces/implementations so they all use persist, remove and merge.
Authored by: keess 2008-10-27
Parent: [r2138]
Child: [r2140]