Minor cleanups in the reader