Clean up some string reading in some files.