Minor cleanup
Merge remote-tracking branch 'origin/events.edges' into future/edge-shapes