Export read-content and assorted minor cleanups.