Removed TODO item (fixed in previous commit), and switched all FileIO methods from public to package-local visibility.