Some restructuring. MergeNCount in progress