More work on reader API.