Various cleanups in Handler, FileWrap, ReaderWrap