Fix without in macro
Fix growing entity_versions
Improve bench