More Reader refactors.