Refactoring toward SerializationProvider. Intermediate check-in--tests not passing yet.