Approximtely 50% speed improvement in tests opening a storyview with 8,000 entries. (I've deferred the indentation adjustments until the next commit so that the git diffs are clearer)