Follow-up on HSEARCH-3643: we enabled entity unproxying for every single entity we encounter in the entity tree, but we really only should unproxy entities when it's really necessary, i.e. when we know we will access a private field on the entity.