Smarter object-indexing of non-variables