NeighborCaches: merge fixes.