With the new num_instances column stored and exposed, we need to make sure nothing still relies on the old implicit way of doing things (SDK, store, query layer).