Merge MemoryTableReader and TableReader, plus misc updates based on review.