More work on cleaning up the initial schema creation and porting the
Reader logic.