(#1860) - WIP - info.doc_count is wrong and slow

See #1859 for why I'm inclined to call it slow.