More groundwork for delegation-based deserialization

7 files changed