Use the Java 7 file API in the IndexedFileSystem.
Finally use the diamond operator throughout.