Slight solver speedup by tracking more carefully which block merges