Three smaller ones. HSEARCH-1508 has huge performance implications

HSEARCH-1508 is the primary performance bottleneck on Infinispan

HSEARCH-1570 was already resolved, but this change should have been done in the scope of it (not worth a separate issue)