First changes preparing for type-checking in the container instead of the individual reader classes.