#260278 by Pancho, sdboyer: Refactored save routines to be more consistent across the various client modules.