Added a branch to use the app delegate's standard saveContext method
when available.
Temporary changes.