Addressing breaking IFileSystem changes

@pranavkm
hmm. I somehow find the existing code more readable than this.