More work on the new file IO system.