Relating to #658 if we're changing the DataStore api, we should clean this up. The IndexWriter can be passed a VisibilityWriter on write() and that should be used instead.