More consistent handling of edges and dual edges.