Fix edge sorting

Found another instance of expecting SegmentContainers to contain
Segments rather than edges. Also, adding virtual edges was generating
bare Edges rather than sets of one Edge, which made cross counting
wrong.
Use the correct layer property for set-positions

Removal of alternating layers was a little ambitious - ended up
using :ordered instead of :minus-p as a replacement in
set-positions