Minor refactoring. Saving an instance on either ops.