2i: Improve index compaction/merge