Refactor FileStore.close

FileStore.close should take better advantage of the Closer instance to close its resources (including the file store lock). Also the order of the close calls should be aligned with their dependencies.