More work in the File class files.