Fix bug 2431;
cleanup another old int-based calculation;
strengthen test to discriminate collections of edges to process together.